diff --git a/src/main/java/net/minecraftforge/common/network/ForgeNetworkHandler.java b/src/main/java/net/minecraftforge/common/network/ForgeNetworkHandler.java
index c3162beb45..493532f8ae 100644
--- a/src/main/java/net/minecraftforge/common/network/ForgeNetworkHandler.java
+++ b/src/main/java/net/minecraftforge/common/network/ForgeNetworkHandler.java
@@ -6,7 +6,6 @@ import cpw.mods.fml.common.network.FMLEmbeddedChannel;
 import cpw.mods.fml.common.network.FMLOutboundHandler;
 import cpw.mods.fml.common.network.FMLOutboundHandler.OutboundTarget;
 import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.common.network.internal.HandshakeCompletionHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -16,7 +15,7 @@ public class ForgeNetworkHandler
 
     public static void registerChannel(ForgeModContainer forgeModContainer, Side side)
     {
-        channelPair = NetworkRegistry.INSTANCE.newChannel(forgeModContainer, "FORGE", new ForgeRuntimeCodec(), new HandshakeCompletionHandler());
+        channelPair = NetworkRegistry.INSTANCE.newChannel(forgeModContainer, "FORGE", new ForgeRuntimeCodec());
         if (side == Side.CLIENT)
         {
             addClientHandlers();
diff --git a/src/main/java/net/minecraftforge/common/network/ForgeRuntimeCodec.java b/src/main/java/net/minecraftforge/common/network/ForgeRuntimeCodec.java
index e46000da99..3af75344e9 100644
--- a/src/main/java/net/minecraftforge/common/network/ForgeRuntimeCodec.java
+++ b/src/main/java/net/minecraftforge/common/network/ForgeRuntimeCodec.java
@@ -8,6 +8,7 @@ public class ForgeRuntimeCodec extends FMLIndexedMessageToMessageCodec<ForgeMess
     public ForgeRuntimeCodec()
     {
         addDiscriminator(1, ForgeMessage.DimensionRegisterMessage.class);
+        addDiscriminator(2, ForgeMessage.FluidIdMapMessage.class);
     }
     @Override
     public void encodeInto(ChannelHandlerContext ctx, ForgeMessage msg, ByteBuf target) throws Exception