diff --git a/exosphere/src/coldboot_main.c b/exosphere/src/coldboot_main.c
index 2d5c1ae..d1951ba 100644
--- a/exosphere/src/coldboot_main.c
+++ b/exosphere/src/coldboot_main.c
@@ -24,5 +24,7 @@
     use_core_entrypoint_and_argument(get_core_id(), &ep, &arg);
 
     /* Nintendo jumps to EL1, we jump to EL2. Both are supported with all current packages2. */
+    /* TODO: Remove this panic() when we're ready to test Kernel handoff. */
+    panic(0x7A700001); 
     __jump_to_lower_el(arg, ep, 2);
 }
diff --git a/exosphere/src/package2.c b/exosphere/src/package2.c
index 940f4f7..9ca9fbe 100644
--- a/exosphere/src/package2.c
+++ b/exosphere/src/package2.c
@@ -463,8 +463,4 @@
         
         __asm__ __volatile__("isb");
     } while(false);
-
-    if (MAILBOX_NX_BOOTLOADER_IS_SECMON_AWAKE) {
-        panic(0x7A700001);
-    }
 }