diff --git a/stepmania/Themes/default/Scripts/Branches.lua b/stepmania/Themes/default/Scripts/Branches.lua
index 43d57ce60f..8feb9e91f7 100644
--- a/stepmania/Themes/default/Scripts/Branches.lua
+++ b/stepmania/Themes/default/Scripts/Branches.lua
@@ -49,6 +49,7 @@ end
 
 function GetGameplayNextScreen()
 	Trace( "GetGameplayNextScreen: " )
+	local Passed = not AllFailed()
 	if( Passed ) then
 		Trace( "Passed" )
 	else
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 269dae2049..4695d17195 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -2346,9 +2346,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
 		SongFinished();
 		StageFinished( false );
 
-		LUA->SetGlobal( "Passed", SM == SM_GoToStateAfterCleared );
 		SCREENMAN->SetNewScreen( NEXT_SCREEN );
-		LUA->UnsetGlobal( "Passed" );
 		break;
 
 	case SM_LoseFocus: