diff --git a/Spigot-Server-Patches/Optimize-draining.patch b/Spigot-Server-Patches/Optimize-draining.patch
index 6bf80c7825..3e3fd2ee6f 100644
--- a/Spigot-Server-Patches/Optimize-draining.patch
+++ b/Spigot-Server-Patches/Optimize-draining.patch
@@ -14,35 +14,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                      world.a(blockposition, (Block) this, j);
 -                    world.applyPhysics(blockposition, this);
 +                    // PaperSpigot start - Optimize draining
-+                    if (world.paperSpigotConfig.optimizeDraining) {
-+                        world.d(blockposition.west(), this);
-+                        world.d(blockposition.east(), this);
-+                        world.d(blockposition.up(), this);
-+                        world.d(blockposition.north(), this);
-+                        world.d(blockposition.south(), this);
-+                        world.spigotConfig.antiXrayInstance.updateNearbyBlocks(world, blockposition); // Spigot
-+                    } else {
-+                        world.applyPhysics(blockposition, this);
-+                    }
++                    world.d(blockposition.west(), this);
++                    world.d(blockposition.east(), this);
++                    world.d(blockposition.up(), this);
++                    world.d(blockposition.north(), this);
++                    world.d(blockposition.south(), this);
++                    world.spigotConfig.antiXrayInstance.updateNearbyBlocks(world, blockposition); // Spigot
 +                    // PaperSpigot end
                  }
              }
          } else {
-diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
-@@ -0,0 +0,0 @@ public class PaperSpigotWorldConfig
-         useAsyncLighting = getBoolean( "use-async-lighting", false );
-         log( "World async lighting: " + useAsyncLighting );
-     }
-+
-+    public boolean optimizeDraining;
-+    private void optimizeDraining()
-+    {
-+        optimizeDraining = getBoolean( "optimize-draining", false );
-+    }
- }
 -- 
 1.9.5.msysgit.1