diff --git a/config-generic b/config-generic
index 9a2477b9d..14f0fec9d 100644
--- a/config-generic
+++ b/config-generic
@@ -4963,7 +4963,8 @@ CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_DEBUG_LIST=y
 CONFIG_DEBUG_SHIRQ=y
 CONFIG_DEBUG_DEVRES=y
-CONFIG_DEBUG_TEST_DRIVER_REMOVE=y
+# This breaks so many things right now :(
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 CONFIG_DEBUG_RODATA_TEST=y
 CONFIG_DEBUG_NX_TEST=m
 CONFIG_DEBUG_SET_MODULE_RONX=y
diff --git a/kernel.spec b/kernel.spec
index d139f6786..523b71195 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2157,6 +2157,9 @@ fi
 #
 #
 %changelog
+* Thu Oct 06 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc0.git3.2
+- Disable CONFIG_DEBUG_TEST_DRIVER_REMOVE
+
 * Thu Oct 06 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc0.git3.1
 - Linux v4.8-8780-gd230ec7