diff --git a/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake
index 5210c24e7b..2fd281ad51 100644
--- a/cmake/Platform/Windows/Packaging_windows.cmake
+++ b/cmake/Platform/Windows/Packaging_windows.cmake
@@ -9,17 +9,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
 
-set(LY_WIX_PATH "" CACHE PATH "Path to the WiX install path")
-
-if(LY_WIX_PATH)
-    file(TO_CMAKE_PATH ${LY_WIX_PATH} CPACK_WIX_ROOT)
-elseif(DEFINED ENV{WIX})
-    file(TO_CMAKE_PATH $ENV{WIX} CPACK_WIX_ROOT)
-endif()
+set(CPACK_WIX_ROOT "" CACHE PATH "Path to the WiX install path")
 
 if(CPACK_WIX_ROOT)
     if(NOT EXISTS ${CPACK_WIX_ROOT})
-        message(FATAL_ERROR "Invalid path supplied for LY_WIX_PATH argument or WIX environment variable")
+        message(FATAL_ERROR "Invalid path supplied for CPACK_WIX_ROOT argument")
     endif()
 else()
     # early out as no path to WiX has been supplied effectively disabling support
diff --git a/scripts/build/Platform/Windows/build_config.json b/scripts/build/Platform/Windows/build_config.json
index b0d16f1fb6..fc4668de0a 100644
--- a/scripts/build/Platform/Windows/build_config.json
+++ b/scripts/build/Platform/Windows/build_config.json
@@ -314,8 +314,7 @@
     "PARAMETERS": {
         "CONFIGURATION": "profile",
         "OUTPUT_DIRECTORY": "build\\windows_vs2019",
-        "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE -DLY_DISABLE_TEST_MODULES=TRUE",
-        "CMAKE_INCLUDE_WIX": "True",
+        "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=TRUE -DLY_DISABLE_TEST_MODULES=TRUE -DCPACK_WIX_ROOT=\"!WIX!\"",
         "CMAKE_LY_PROJECTS": "",
         "CMAKE_TARGET": "ALL_BUILD",
         "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
diff --git a/scripts/build/Platform/Windows/build_windows.cmd b/scripts/build/Platform/Windows/build_windows.cmd
index 799e6828b2..3e995e1905 100644
--- a/scripts/build/Platform/Windows/build_windows.cmd
+++ b/scripts/build/Platform/Windows/build_windows.cmd
@@ -38,14 +38,6 @@ IF NOT EXIST %TMP% (
 REM Compute half the amount of processors so some jobs can run
 SET /a HALF_PROCESSORS = NUMBER_OF_PROCESSORS / 2
 
-IF "%CMAKE_INCLUDE_WIX%"=="True" (
-    REM Explicitly enable wix via command line arg for forensic logging
-    SET CMAKE_OPTIONS=%CMAKE_OPTIONS% -DLY_WIX_PATH="%WIX%"
-) ELSE (
-    REM Disable implicit enabling of windows packing by clearing out the wix variable
-    SET WIX=
-)
-
 SET LAST_CONFIGURE_CMD_FILE=ci_last_configure_cmd.txt
 SET CONFIGURE_CMD=cmake %SOURCE_DIRECTORY% %CMAKE_OPTIONS% %EXTRA_CMAKE_OPTIONS% -DLY_3RDPARTY_PATH="%LY_3RDPARTY_PATH%" -DLY_PROJECTS=%CMAKE_LY_PROJECTS%
 IF NOT EXIST CMakeCache.txt (