diff --git a/patches/server/0152-Fix-this-stupid-bullshit.patch b/patches/server/0152-Fix-this-stupid-bullshit.patch
index a666a1f647..52308387ea 100644
--- a/patches/server/0152-Fix-this-stupid-bullshit.patch
+++ b/patches/server/0152-Fix-this-stupid-bullshit.patch
@@ -8,6 +8,28 @@ Disable the 15 second sleep when the server jar hasn't been rebuilt within a per
 modified in order to prevent merge conflicts when Spigot changes/disables the warning,
 and to provide some level of hint without being disruptive.
 
+diff --git a/src/main/java/net/minecraft/server/Bootstrap.java b/src/main/java/net/minecraft/server/Bootstrap.java
+index c7d5018cb6acef12e6da90626c75543ac279a101..64576ddd8363be55755fa50d1c16d95e4e02402d 100644
+--- a/src/main/java/net/minecraft/server/Bootstrap.java
++++ b/src/main/java/net/minecraft/server/Bootstrap.java
+@@ -42,7 +42,7 @@ public class Bootstrap {
+     public static void bootStrap() {
+         if (!Bootstrap.isBootstrapped) {
+             // CraftBukkit start
+-            String name = Bootstrap.class.getSimpleName();
++            /*String name = Bootstrap.class.getSimpleName(); // Paper - actually, I don't think this class should ever have been called DispenserRegistry, that's a stupid name, bootstrap is waaay better
+             switch (name) {
+                 case "DispenserRegistry":
+                     break;
+@@ -56,7 +56,7 @@ public class Bootstrap {
+                     System.err.println("*** WARNING: This server jar is unsupported, use at your own risk. ***");
+                     System.err.println("**********************************************************************");
+                     break;
+-            }
++            }*/ // Paper
+             // CraftBukkit end
+             Bootstrap.isBootstrapped = true;
+             if (Registry.REGISTRY.keySet().isEmpty()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
 index b4bcd34123968b3930bb330f7c2abd9b5518fa31..f68d44721c91c20a7e4abffe26dabff8b5d2c3ce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java