diff --git a/Misc/NEWS.d/next/Windows/2022-03-04-00-24-55.bpo-46744.tneWFr.rst b/Misc/NEWS.d/next/Windows/2022-03-04-00-24-55.bpo-46744.tneWFr.rst
new file mode 100644
index 00000000000000..25f9e7a04b08db
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2022-03-04-00-24-55.bpo-46744.tneWFr.rst
@@ -0,0 +1,3 @@
+The default all users install directory for ARM64 is now under the native
+``Program Files`` folder, rather than ``Program Files (Arm)`` which is
+intended for ARM (32-bit) files.
diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
index 226416f3545850..fdc2a21d83d5f3 100644
--- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
+++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
@@ -1501,9 +1501,6 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
hr = UpdateUIStrings(_command.action);
BalExitOnFailure(hr, "Failed to load UI strings.");
- hr = FindProgramFilesArm();
- BalExitOnFailure(hr, "Fatal error locating Program Files (Arm)");
-
GetBundleFileVersion();
// don't fail if we couldn't get the version info; best-effort only
LExit:
@@ -2184,37 +2181,6 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
return hr;
}
- HRESULT FindProgramFilesArm() {
- wchar_t buffer[MAX_PATH + 1];
- DWORD bufferLen = MAX_PATH;
- LSTATUS res = RegGetValueW(
- HKEY_LOCAL_MACHINE,
- L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion",
- L"ProgramFilesDir (Arm)",
- RRF_RT_REG_SZ | RRF_RT_REG_EXPAND_SZ | RRF_SUBKEY_WOW6464KEY,
- NULL,
- buffer,
- &bufferLen
- );
- if (res != ERROR_SUCCESS) {
- // ProgramFilesArmFolder will default to ProgramFilesFolder. We only report
- // an error if the value existed, as it will simply just be absent on non-ARM
- // devices.
- if (res != ERROR_FILE_NOT_FOUND) {
- BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Failed to query 'ProgramFilesDir (Arm)': error code %d", res);
- }
- return S_OK;
- }
- if (buffer[0]) {
- wchar_t *p = &buffer[bufferLen / sizeof(wchar_t) - 1];
- while (*p == L'\\' || *p == L'\0') { p -= 1; }
- *++p = L'\\';
- *++p = L'\0';
- _engine->SetVariableString(L"ProgramFilesArmFolder", buffer);
- }
- return S_OK;
- }
-
//
// OnPlan - plan the detected changes.
//
diff --git a/Tools/msi/bundle/bundle.wxs b/Tools/msi/bundle/bundle.wxs
index 340c72acf408be..0683f87cb05863 100644
--- a/Tools/msi/bundle/bundle.wxs
+++ b/Tools/msi/bundle/bundle.wxs
@@ -26,9 +26,6 @@
-
-
-
@@ -40,7 +37,7 @@
-
+