diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c5b4abb289..ac9fe492113 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,6 +102,12 @@ endif()
 if (ENABLE_ALL_DEBUG_FACILITIES)
     set(ENABLE_ALL_THE_DEBUG_MACROS ON)
     set(ENABLE_EXTRA_KERNEL_DEBUG_SYMBOLS ON)
+
+    # Immediately finds violations during boot, shouldn't be discoverable
+    # by people who aren't working on fixing issues. Use this check to make
+    # sure this code continues to build instead of all_debug_macros to avoid
+    # people filing bugs.
+    set(KMALLOC_VERIFY_NO_SPINLOCK_HELD ON)
 endif()
 
 if (ENABLE_ALL_THE_DEBUG_MACROS)
diff --git a/Meta/CMake/all_the_debug_macros.cmake b/Meta/CMake/all_the_debug_macros.cmake
index f1075a59c57..63d6fe1f1c4 100644
--- a/Meta/CMake/all_the_debug_macros.cmake
+++ b/Meta/CMake/all_the_debug_macros.cmake
@@ -68,7 +68,6 @@ set(PORTABLE_IMAGE_LOADER_DEBUG ON)
 set(SYNTAX_HIGHLIGHTING_DEBUG ON)
 set(KEYBOARD_SHORTCUTS_DEBUG ON)
 set(KMALLOC_DEBUG ON)
-set(KMALLOC_VERIFY_NO_SPINLOCK_HELD ON)
 set(MARKDOWN_DEBUG ON)
 set(REGEX_DEBUG ON)
 set(TLS_DEBUG ON)
@@ -208,3 +207,5 @@ set(WEBSERVER_DEBUG ON)
 # set(DEFINE_DEBUG_REGISTER ON)
 # Clogs up build: The WrapperGenerator stuff is run at compile time.
 # set(WRAPPER_GENERATOR_DEBUG ON)
+# Immediately finds violations during boot, shouldn't be discoverable by people who aren't working on fixing.
+# set(KMALLOC_VERIFY_NO_SPINLOCK_HELD ON)