diff --git a/Bukkit b/Bukkit
index f714a0eb17..5fa44fc1a1 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit f714a0eb175d1619a7847946cdea1056649cd597
+Subproject commit 5fa44fc1a10ad8b3efca62ef0429aadce253c8bc
diff --git a/CraftBukkit b/CraftBukkit
index 935349e3a3..b6bb6beb63 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 935349e3a39e3d39403afef0e750710fdc396d2a
+Subproject commit b6bb6beb63c794a74076b68686ea2298f1f51450
diff --git a/Spigot-Server-Patches/Re-add-playSound-in-CraftWorld.patch b/Spigot-Server-Patches/Re-add-playSound-in-CraftWorld.patch
deleted file mode 100644
index d8eea9a933..0000000000
--- a/Spigot-Server-Patches/Re-add-playSound-in-CraftWorld.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Zach Brown <1254957+zachbr@users.noreply.github.com>
-Date: Sun, 6 Mar 2016 14:31:04 -0600
-Subject: [PATCH] Re-add playSound in CraftWorld
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -0,0 +0,0 @@ public class CraftWorld implements World {
-         getHandle().a(null, x, y, z, CraftSound.getSoundEffect(CraftSound.getSound(sound)), SoundCategory.MASTER, volume, pitch); // PAIL: rename
-     }
- 
-+    // Paper - This is getting removed somewhere/somehow and preventing a build from compiling
-+    public void playSound(Location loc, String sound, float volume, float pitch) {
-+        if (loc == null || sound == null) return;
-+
-+        double x = loc.getX();
-+        double y = loc.getY();
-+        double z = loc.getZ();
-+
-+        PacketPlayOutCustomSoundEffect packet = new PacketPlayOutCustomSoundEffect(sound, SoundCategory.MASTER, x, y, z, volume, pitch);
-+        world.getMinecraftServer().getPlayerList().sendPacketNearby(null, x, y, z, volume > 1.0F ? 16.0F * volume : 16.0D, this.world.dimension, packet);
-+    }
-+
-     public String getGameRuleValue(String rule) {
-         return getHandle().getGameRules().get(rule);
-     }
---
\ No newline at end of file