Index: /trunk/src/VBox/VMM/CPUM.cpp
===================================================================
--- /trunk/src/VBox/VMM/CPUM.cpp	(revision 8128)
+++ /trunk/src/VBox/VMM/CPUM.cpp	(revision 8129)
@@ -406,5 +406,4 @@
     }
 
-#ifndef PGM_WITH_BROKEN_32PAE_SWITCHER
     /* Check if PAE was explicitely enabled by the user. */
     bool fEnable = false;
@@ -412,5 +411,4 @@
     if (VBOX_SUCCESS(rc) && fEnable)
         CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_PAE);
-#endif
 
     /*
Index: /trunk/src/VBox/VMM/PGM.cpp
===================================================================
--- /trunk/src/VBox/VMM/PGM.cpp	(revision 8128)
+++ /trunk/src/VBox/VMM/PGM.cpp	(revision 8129)
@@ -1579,20 +1579,4 @@
 {
     LogFlow(("PGMR3Relocate\n"));
-
-#ifdef PGM_WITH_BROKEN_32PAE_SWITCHER
-    if (!CPUMGetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_PAE))
-    {
-        bool fEnable = false;
-        int rc = CFGMR3QueryBool(CFGMR3GetRoot(pVM), "EnablePAE", &fEnable);
-        if (    VBOX_SUCCESS(rc) 
-            &&  fEnable
-            &&  (PGMGetHostMode(pVM) >= PGMMODE_PAE || HWACCMIsEnabled(pVM))
-           )
-        {
-            CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_PAE);
-            LogRel(("PGMR3Relocate: turned on PAE\n"));
-        }
-    }
-#endif
 
     /*
Index: /trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp	(revision 8128)
+++ /trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp	(revision 8129)
@@ -27,6 +27,4 @@
 #include "CPUMInternal.h"
 #include <VBox/vm.h>
-#include <VBox/pgm.h>
-#include <VBox/hwaccm.h>
 #include <VBox/err.h>
 #include <VBox/dis.h>
@@ -1036,13 +1034,4 @@
                 return;
             }
-#ifdef PGM_WITH_BROKEN_32PAE_SWITCHER
-            /* Remove this restriction once the 32->PAE switcher works properly. */
-            if (    PGMGetHostMode(pVM) <= PGMMODE_32_BIT
-                &&  !HWACCMIsEnabled(pVM))
-            {
-                LogRel(("WARNING: Can't turn on PAE when the host is in 32 bits paging mode!!\n"));
-                return;
-            }
-#endif
 
             if (pVM->cpum.s.aGuestCpuIdStd[0].eax >= 1)