diff --git a/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeClientState.java b/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeClientState.java
index 12ed5f3692..1f756f3301 100644
--- a/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeClientState.java
+++ b/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeClientState.java
@@ -125,6 +125,11 @@ enum FMLHandshakeClientState implements IHandshakeState<FMLHandshakeClientState>
         @Override
         public FMLHandshakeClientState accept(ChannelHandlerContext ctx, FMLHandshakeMessage msg)
         {
+            if (msg instanceof FMLHandshakeMessage.HandshakeReset)
+            {
+                GameData.revertToFrozen();
+                return HELLO;
+            }
             return this;
         }
     },
diff --git a/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeCodec.java b/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeCodec.java
index 8ccd3c9f3c..e004876017 100644
--- a/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeCodec.java
+++ b/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeCodec.java
@@ -12,6 +12,7 @@ public class FMLHandshakeCodec extends FMLIndexedMessageToMessageCodec<FMLHandsh
         addDiscriminator((byte)2, FMLHandshakeMessage.ModList.class);
         addDiscriminator((byte)3, FMLHandshakeMessage.ModIdData.class);
         addDiscriminator((byte)-1, FMLHandshakeMessage.HandshakeAck.class);
+        addDiscriminator((byte)-2, FMLHandshakeMessage.HandshakeReset.class);
     }
     @Override
     public void encodeInto(ChannelHandlerContext ctx, FMLHandshakeMessage msg, ByteBuf target) throws Exception
diff --git a/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeMessage.java b/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeMessage.java
index d9987034bd..d11933c44e 100644
--- a/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeMessage.java
+++ b/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeMessage.java
@@ -235,6 +235,9 @@ public abstract class FMLHandshakeMessage {
             return super.toString(side) + ":{"+phase+"}";
         }
     }
+    public static class HandshakeReset extends FMLHandshakeMessage {
+        public HandshakeReset() {}
+    }
     public void fromBytes(ByteBuf buffer)
     {
     }