diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif
index ed359f99bbe18..9e7c207ef9d68 100644
--- a/boot/bootdata/txtsetup.sif
+++ b/boot/bootdata/txtsetup.sif
@@ -215,7 +215,8 @@ Cabinet=reactos.cab
 
 [SetupData]
 DefaultPath = \ReactOS
-SetupDebugOptions = "/DEBUG /KDSERIAL /DEBUGPORT=COM1 /FIRSTCHANCE"
+SetupDebugOptions = "/DEBUG /NOGUIBOOT /DEBUGPORT=VBOX /FIRSTCHANCE"
+;SetupDebugOptions = "/DEBUG /KDSERIAL /DEBUGPORT=COM1 /FIRSTCHANCE"
 ;SetupDebugOptions = "/DEBUG /SOS /DEBUGPORT=SCREEN"
 OsLoadOptions = "/NOGUIBOOT /NODEBUG"
 
diff --git a/ntoskrnl/ke/i386/kiinit.c b/ntoskrnl/ke/i386/kiinit.c
index 9699d11b03c3a..a74f137e40ca5 100644
--- a/ntoskrnl/ke/i386/kiinit.c
+++ b/ntoskrnl/ke/i386/kiinit.c
@@ -274,8 +274,10 @@ KiInitMachineDependent(VOID)
         DPRINT1("ISR Time Limit not yet supported\n");
     }
 
+#if 0 // FIXME: See https://github.com/reactos/reactos/commit/90e0457d606c7088a3082397cf11c8c94aa1e862
     /* Set CR0 features based on detected CPU */
     KiSetCR0Bits();
+#endif
 }
 
 CODE_SEG("INIT")
@@ -440,6 +442,13 @@ KiInitializeKernel(IN PKPROCESS InitProcess,
     PVOID DpcStack;
     KIRQL DummyIrql;
 
+#if 1 // FIXME: See https://github.com/reactos/reactos/commit/90e0457d606c7088a3082397cf11c8c94aa1e862
+    /* Set CR0 features based on detected CPU */
+    KiSetCR0Bits();
+#endif
+
+__debugbreak();
+
     /* Initialize the Power Management Support for this PRCB */
     PoInitializePrcb(Prcb);