diff --git a/Spigot-Server-Patches/Timings-v2.patch b/Spigot-Server-Patches/Timings-v2.patch
index 04ffe2191..8f3f81270 100644
--- a/Spigot-Server-Patches/Timings-v2.patch
+++ b/Spigot-Server-Patches/Timings-v2.patch
@@ -774,19 +774,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  } else {
                      PlayerConnectionUtils.LOGGER.debug("Ignoring packet due to disconnection: " + packet);
                  }
-diff --git a/src/main/java/net/minecraft/network/protocol/game/PacketPlayInChat.java b/src/main/java/net/minecraft/network/protocol/game/PacketPlayInChat.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/network/protocol/game/PacketPlayInChat.java
-+++ b/src/main/java/net/minecraft/network/protocol/game/PacketPlayInChat.java
-@@ -0,0 +0,0 @@ public class PacketPlayInChat implements Packet<PacketListenerPlayIn> {
- 
-     @Override
-     public void a(PacketDataSerializer packetdataserializer) throws IOException {
--        this.a = packetdataserializer.e(256);
-+        this.a = org.apache.commons.lang3.StringUtils.normalizeSpace(packetdataserializer.e(256));
-     }
- 
-     @Override
 diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/CustomFunctionData.java
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 3797d93e3..fae895ac1 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 3797d93e369645c9b2d9ab0188aa893a11280628
+Subproject commit fae895ac110a830e4bbd5cc9eadbf70104ce215e