diff --git a/tools/CLU/BuildAndInstallClu.bat b/tools/CLU/BuildAndInstallClu.bat
index b173cdf374f9..59b09899b0ee 100644
--- a/tools/CLU/BuildAndInstallClu.bat
+++ b/tools/CLU/BuildAndInstallClu.bat
@@ -6,6 +6,17 @@ if ERRORLEVEL 1 (
     echo Please install 'dotnet', say from 'https://azureclu.blob.core.windows.net/tools/dotnet-win-x64.latest.zip', unzip, then add its bin folder to the PATH
     exit /B 1
 )
+
+pushd
+cd %root%\src\CLU
+call dnu.cmd restore
+if ERRORLEVEL 1 (
+    echo "dnu.cmd restore" failed under folder of "%root%\src\CLU"
+    popd
+    exit /B 1
+)
+popd
+
 @powershell -file %~dp0\BuildDrop.ps1
 
 REM cook a msclu.cfg with a correct local repro path. 
diff --git a/tools/CLU/SetupEnv.bat b/tools/CLU/SetupEnv.bat
index 2b7411f6881c..af64b5c0ac04 100644
--- a/tools/CLU/SetupEnv.bat
+++ b/tools/CLU/SetupEnv.bat
@@ -1,13 +1,6 @@
 echo off
 setlocal
 set root=%~dp0..\..
-echo Build all clu source projects
-"%ProgramFiles(x86)%\MSBuild\14.0\Bin\msbuild" %root%\build.proj /t:build >NUL
-
-if ERRORLEVEL 1 (
-   echo Build source project failed. To repro, run: msbuild build.proj /t:build
-   exit /B 1
-) 
 
 REM build cmdlets packages
 set DebugCLU=