diff --git a/Quake/cl_demo.c b/Quake/cl_demo.c
index 8fe8b262..95511ce3 100644
--- a/Quake/cl_demo.c
+++ b/Quake/cl_demo.c
@@ -92,13 +92,6 @@ static int CL_GetDemoMessage (void)
 	// decide if it is time to grab the next message
 	if (cls.signon == SIGNONS)	// always grab until fully connected
 	{
-		// Wait for full frame update on stufftext messages:
-		// If the server stuffs a "reconnect", failing to wait
-		// for the client to re-initialize before accepting
-		// further messages freezes demo playback.  -- Pa3PyX
-		if (host_framecount == cls.stufftext_frame)
-			return 0;
-
 		if (cls.timedemo)
 		{
 			if (host_framecount == cls.td_lastframe)
@@ -446,10 +439,6 @@ void CL_PlayDemo_f (void)
 
 // get rid of the menu and/or console
 	key_dest = key_game;
-
-// Get a new message on playback start.
-// Moved from CL_TimeDemo_f to here, Pa3PyX.
-	cls.td_lastframe = -1;
 }
 
 /*
@@ -500,7 +489,6 @@ void CL_TimeDemo_f (void)
 
 	cls.timedemo = true;
 	cls.td_startframe = host_framecount;
-//	cls.td_lastframe = -1;	// get a new message this frame
-				// Moved to CL_PlayDemo_f(), Pa3PyX.
+	cls.td_lastframe = -1;
 }
 
diff --git a/Quake/cl_parse.c b/Quake/cl_parse.c
index 367fefc7..89501cac 100644
--- a/Quake/cl_parse.c
+++ b/Quake/cl_parse.c
@@ -999,18 +999,7 @@ void CL_ParseServerMessage (void)
 			break;
 
 		case svc_stufftext:
-			str = MSG_ReadString ();
-			// ericw -- hack - only wait for the full frame update if the stufftext
-			// contains "reconnect". some mods, e.g. honey, send stufftext every frame;
-			// if we were to set cls.stufftext_frame every frame, that would break
-			// the playback rate control (causing demos to play back in slow-motion
-			// if the client can't keep up)
-			if (strstr (str, "reconnect") != NULL)
-			{
-				cls.stufftext_frame = host_framecount;	// allow full frame update
-									// in demo playback -- Pa3PyX
-			}
-			Cbuf_AddText (str);
+			Cbuf_AddText (MSG_ReadString ());
 			break;
 
 		case svc_damage:
diff --git a/Quake/client.h b/Quake/client.h
index 0605484d..80a187a3 100644
--- a/Quake/client.h
+++ b/Quake/client.h
@@ -120,7 +120,6 @@ typedef struct
 	FILE		*demofile;
 	int		td_lastframe;		// to meter out one message a frame
 	int		td_startframe;		// host_framecount at start
-	int		stufftext_frame;	// host_framecount when svc_stufftext is received
 	float		td_starttime;		// realtime at second frame of timedemo
 
 // connection information