diff --git a/ms/setVSvars.bat b/ms/setVSvars.bat
index 7ee3c09b60f4f..8c1bca3df76cb 100644
--- a/ms/setVSvars.bat
+++ b/ms/setVSvars.bat
@@ -29,10 +29,12 @@ exit /b
 	call:setVar _VS15VC VisualStudio15VC
 	if not "%_VS15VC%"=="" (
 		call "%_VS15VC%\vcvarsall" x86_arm store
+		rem
 		call:setEnv
 		goto :eof
 	)
 	call:setVar _VS14VC VisualStudio14VC
+    rem
 	call "%_VS14VC%vcvarsall" x86_arm store
 	call:setEnv
 	goto :eof
@@ -207,7 +209,7 @@ exit /b
 	call:setVar _VS15VC VisualStudio15VC
 	call:setVar _WKITS10 WindowsKits10.0
 	call:setVar _WKITS10VER WindowsKits10Version
-	set LIBPATH=%LIBPATH%;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.foundationcontract\2.0.0.0\;%_WKITS10%references\%_WKITS10VER%.0\windows.foundation.foundationcontract\3.0.0.0\;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.universalapicontract\2.0.0.0\;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.foundationcontract\1.0.0.0\;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.universalapicontract\4.0.0.0\;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.universalapicontract\3.0.0.0\;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.universalapicontract\2.0.0.0\;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.universalapicontract\1.0.0.0\
+	set LIBPATH=%LIBPATH%;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.foundationcontract\3.0.0.0\;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.foundationcontract\2.0.0.0\;%_WKITS10%references\%_WKITS10VER%.0\windows.foundation.foundationcontract\3.0.0.0\;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.universalapicontract\2.0.0.0\;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.foundationcontract\1.0.0.0\;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.universalapicontract\4.0.0.0\;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.universalapicontract\3.0.0.0\;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.universalapicontract\2.0.0.0\;%_WKITS10%\references\%_WKITS10VER%.0\windows.foundation.universalapicontract\1.0.0.0\
 	goto :eof
 
 :end