diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp
index 49631fad57..8aef166034 100644
--- a/stepmania/src/Screen.cpp
+++ b/stepmania/src/Screen.cpp
@@ -67,6 +67,10 @@ void Screen::Update( float fDeltaTime )
 		 *
 		 * Let's delay all messages that have a non-zero time an extra frame. 
 		 */
+		/* I don't think this is needed anymore, since SetNewScreen is always delayed
+		 * until the next update.  It might have other impacts, though, so I'm not sure. */
+		m_QueuedMessages[i].fDelayRemaining -= fDeltaTime;
+		/*
 		if( m_QueuedMessages[i].fDelayRemaining > 0.0001f )
 		{
 			m_QueuedMessages[i].fDelayRemaining -= fDeltaTime;
@@ -76,6 +80,7 @@ void Screen::Update( float fDeltaTime )
 		{
 			m_QueuedMessages[i].fDelayRemaining -= fDeltaTime;
 		}
+		*/
 	}
 
 	/* Now dispatch messages.  If the number of messages on the queue changes