diff --git a/Spigot-Server-Patches/Optimize-Light-Engine.patch b/Spigot-Server-Patches/Optimize-Light-Engine.patch
index 1215dbd733..eb82185215 100644
--- a/Spigot-Server-Patches/Optimize-Light-Engine.patch
+++ b/Spigot-Server-Patches/Optimize-Light-Engine.patch
@@ -33,7 +33,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  return true;
              } else {
 -                ChunkProviderServer.this.lightEngine.queueUpdate();
-+                //ChunkProviderServer.this.lightEngine.queueUpdate(); // Paper - not needed
++                ChunkProviderServer.this.lightEngine.queueUpdate(); // Paper - not needed
                  return super.executeNext() || execChunkTask; // Paper
              }
          } finally {
@@ -439,18 +439,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              this.p.close();
              this.world.asyncChunkTaskManager.close(true); // Paper - Required since we're closing regionfiles in the next line
              this.m.close();
-diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/level/WorldServer.java
-+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
-@@ -0,0 +0,0 @@ public class WorldServer extends World implements GeneratorAccessSeed {
-             }
-             gameprofilerfiller.exit();
-             timings.chunkTicksBlocks.stopTiming(); // Paper
-+            getChunkProvider().getLightEngine().queueUpdate(); // Paper
-             // Paper end
-         }
-     }
 diff --git a/src/main/java/net/minecraft/util/thread/ThreadedMailbox.java b/src/main/java/net/minecraft/util/thread/ThreadedMailbox.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/util/thread/ThreadedMailbox.java