Index: /trunk/src/VBox/VMM/VMMR3/HM.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/HM.cpp	(revision 46717)
+++ /trunk/src/VBox/VMM/VMMR3/HM.cpp	(revision 46718)
@@ -2612,4 +2612,5 @@
                 &&  !pVM->hm.s.vmx.fUnrestrictedGuest)
             {
+#ifdef VBOX_WITH_OLD_VTX_CODE
                 /** @todo   This should (probably) be set on every excursion to the REM,
                  *          however it's too risky right now. So, only apply it when we go
@@ -2619,4 +2620,5 @@
                 for (uint32_t i = 0; i < pVM->cCpus; i++)
                     pVM->aCpus[i].hm.s.fContextUseFlags |= HM_CHANGED_ALL_GUEST;
+#endif
 
                 if (    !pVM->hm.s.fNestedPaging        /* requires a fake PD for real *and* protected mode without paging - stored in the VMM device heap */