diff --git a/BUILD_WIN.md b/BUILD_WIN.md
index 2d6074cd77..2faa9809bb 100644
--- a/BUILD_WIN.md
+++ b/BUILD_WIN.md
@@ -66,12 +66,6 @@ Open `%HIFI_DIR%\build\hifi.sln` using Visual Studio.
 
 Change the Solution Configuration (menu ribbon under the menu bar, next to the green play button) from "Debug" to "Release" for best performance.
 
-Create another environment variable (see Step #3)
-* Set "Variable name": `PreferredToolArchitecture`
-* Set "Variable value": `x64`
-
-Restart Visual Studio for the new variable to take effect.
-
 Run from the menu bar `Build > Build Solution`.
 
 ### Step 6. Testing Interface
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9876a0d7ef..5e4746418d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,11 @@ endif()
 include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/macros/TargetPython.cmake")
 target_python()
 
+if (WIN32)
+    # Force x64 toolset
+    set(CMAKE_GENERATOR_TOOLSET "host=x64" CACHE STRING "64-bit toolset" FORCE)
+endif()
+
 # set our OS X deployment target
 # (needs to be set before first project() call and before prebuild.py)
 # Will affect VCPKG dependencies