diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
index 7a24c5cc4a57..168ec6a6cffb 100644
--- a/llvm/CMakeLists.txt
+++ b/llvm/CMakeLists.txt
@@ -534,7 +534,7 @@ if(NOT DEFINED LLVM_DYLIB_COMPONENTS)
 endif()
 option(LLVM_LINK_LLVM_DYLIB "Link tools against the libllvm dynamic library" OFF)
 if(MSVC)
-  option(LLVM_BUILD_LLVM_C_DYLIB "Build LLVM-C.dll (Windows only)" ON)
+  option(LLVM_BUILD_LLVM_C_DYLIB "Build LLVM-C.dll (Windows only)" OFF)
 else()
   option(LLVM_BUILD_LLVM_C_DYLIB "Build libllvm-c re-export library (Darwin only)" OFF)
 endif()
diff --git a/llvm/utils/release/build_llvm_package.bat b/llvm/utils/release/build_llvm_package.bat
index dc2aab7172ca..ae406c84e01b 100755
--- a/llvm/utils/release/build_llvm_package.bat
+++ b/llvm/utils/release/build_llvm_package.bat
@@ -52,17 +52,7 @@ svn.exe export -r %revision% http://llvm.org/svn/llvm-project/lldb/%branch% llvm
 
 
 REM Setting CMAKE_CL_SHOWINCLUDES_PREFIX to work around PR27226.
-set cmake_flags=^
-	-DCMAKE_BUILD_TYPE=Release ^
-	-DLLVM_ENABLE_ASSERTIONS=ON ^
-	-DLLVM_INSTALL_TOOLCHAIN_ONLY=ON ^
-	-DLLVM_BUILD_LLVM_C_DYLIB=ON ^
-	-DCMAKE_INSTALL_UCRT_LIBRARIES=ON ^
-	-DCLANG_FORMAT_VS_VERSION=%clang_format_vs_version% ^
-	-DPACKAGE_VERSION=%package_version% ^
-	-DLLDB_RELOCATABLE_PYTHON=1 ^
-	-DLLDB_TEST_COMPILER=%cd%\build32_stage0\bin\clang.exe ^
-	-DCMAKE_CL_SHOWINCLUDES_PREFIX="Note: including file: "
+set cmake_flags=-DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON -DCMAKE_INSTALL_UCRT_LIBRARIES=ON -DCLANG_FORMAT_VS_VERSION=%clang_format_vs_version% -DPACKAGE_VERSION=%package_version% -DLLDB_RELOCATABLE_PYTHON=1 -DLLDB_TEST_COMPILER=%cd%\build32_stage0\bin\clang.exe -DCMAKE_CL_SHOWINCLUDES_PREFIX="Note: including file: "
 
 REM TODO: Run all tests, including lld and compiler-rt.