Index: /trunk/src/VBox/VMM/VMMR3/PGM.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/PGM.cpp	(revision 65901)
+++ /trunk/src/VBox/VMM/VMMR3/PGM.cpp	(revision 65902)
@@ -2549,4 +2549,7 @@
     int rc = PGM_GST_PFN(Exit, pVCpu)(pVCpu);
     AssertRC(rc);
+#ifdef REMEMBER_TO_ENABLE_THESE_GCPhycCR3_NIL_ASSIGNMENTS /** @todo Enable r113096 and fix. */
+    pVCpu->pgm.s.GCPhysCR3 = NIL_RTGCPHYS;
+#endif
 
     rc = PGMR3ChangeMode(pVM, pVCpu, PGMMODE_REAL);
@@ -2603,4 +2606,7 @@
         int rc = PGM_GST_PFN(Exit, pVCpu)(pVCpu);
         AssertReleaseRC(rc);
+#ifdef REMEMBER_TO_ENABLE_THESE_GCPhycCR3_NIL_ASSIGNMENTS /** @todo Enable r113096 and fix. */
+        pVCpu->pgm.s.GCPhysCR3 = NIL_RTGCPHYS;
+#endif
     }
 
@@ -3514,4 +3520,7 @@
         }
     }
+#ifdef REMEMBER_TO_ENABLE_THESE_GCPhycCR3_NIL_ASSIGNMENTS /** @todo Enable r113096 and fix. */
+    pVCpu->pgm.s.GCPhysCR3 = NIL_RTGCPHYS;
+#endif
 
     /*
@@ -3740,4 +3749,7 @@
     int rc = PGM_BTH_PFN(UnmapCR3, pVCpu)(pVCpu);
     AssertRC(rc);
+#ifdef REMEMBER_TO_ENABLE_THESE_GCPhycCR3_NIL_ASSIGNMENTS /** @todo Enable r113096 and fix. */
+    pVCpu->pgm.s.GCPhysCR3 = NIL_RTGCPHYS;
+#endif
 
     /* Exit the current shadow paging mode as well; nested paging and EPT use a root CR3 which will get flushed here. */