diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 88191a7f5b..e892f36eb5 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -44,7 +44,7 @@ OPTION(USE_VLD "Use Visual Leak Detector for debugging memory leaks, MSVC-only."
 OPTION(USE_MMAP "Adds a command line options to parse IFC files from memory mapped files using Boost.Iostreams" OFF)
 OPTION(USE_VOXELS "Use voxelized geometries as a fallback mechanism to calculate quantities in IfcGeomServer" OFF)
 OPTION(USE_CGAL "Use CGAL as an alternative geometry kernel implementation" OFF)
-OPTION(USE_STATIC_MSVC_RUNTIME "Link to the static runtime on MSVC." ON)
+OPTION(USE_STATIC_MSVC_RUNTIME "Link to the static runtime on MSVC." OFF)
 OPTION(BUILD_SHARED_LIBS "Build IfcParse and IfcGeom as shared libs (SO/DLL)." OFF)
 if (${HAS_MAX})
 OPTION(BUILD_IFCMAX "Build IfcMax, a 3ds Max plug-in, Windows-only." ON)
diff --git a/win/build-deps.cmd b/win/build-deps.cmd
index 1805fb5180..d588c104a2 100644
--- a/win/build-deps.cmd
+++ b/win/build-deps.cmd
@@ -157,8 +157,6 @@ set OCE_VERSION=OCE-0.18
 set PYTHON_VERSION=3.4.3
 set SWIG_VERSION=3.0.12
 
-goto :Eigen
-
 :: Note all of the dependencies have appropriate label so that user can easily skip something if wanted
 :: by modifying this file and using goto.
 :Boost