diff --git a/src/GameState.cpp b/src/GameState.cpp
index b94373dda5..35d61decd0 100644
--- a/src/GameState.cpp
+++ b/src/GameState.cpp
@@ -716,8 +716,6 @@ void GameState::BeginStage()
 			ModsGroup<PlayerOptions> &po = m_pPlayerState[p]->m_PlayerOptions;
 			po.Assign(ModsLevel_Stage,
 					  m_pPlayerState[p]->m_PlayerOptions.GetPreferred());
-			// Note: at this point, fail type should already be set.
-			PO_GROUP_ASSIGN(po, ModsLevel_Preferred, m_FailType, po.GetPreferred().m_FailType);
 		}
 	}
 	if( !ARE_STAGE_SONG_MODS_FORCED )
diff --git a/src/PrefsManager.cpp b/src/PrefsManager.cpp
index 751c590fc6..2330c23869 100644
--- a/src/PrefsManager.cpp
+++ b/src/PrefsManager.cpp
@@ -125,15 +125,16 @@ XToString( CourseSortOrders );
 StringToX( CourseSortOrders );
 LuaXType( CourseSortOrders );
 
-static const char *DefaultFailTypeNames[] = {
+// XXX: Fix fail bug?
+/* static const char *DefaultFailTypeNames[] = {
 	"Immediate",
 	"ImmediateContinue",
-	"AtEnd",
+	"EndOfSong",
 	"Off",
 };
 XToString( DefaultFailType );
 StringToX( DefaultFailType );
-LuaXType( DefaultFailType );
+LuaXType( DefaultFailType ); */
 
 bool g_bAutoRestart = false;
 #ifdef DEBUG
@@ -190,8 +191,6 @@ PrefsManager::PrefsManager() :
 
 	m_fLifeDifficultyScale	( "LifeDifficultyScale",	1.0f ),
 
-	m_sDefaultFailType ("DefaultFailType", FAIL_IMMEDIATE),
-
 
 	m_iRegenComboAfterMiss		( "RegenComboAfterMiss",	5 ),
 	m_bMercifulDrain		( "MercifulDrain",		true ),	// negative life deltas are scaled by the players life percentage
diff --git a/src/PrefsManager.h b/src/PrefsManager.h
index 12a44c5b85..589da26533 100644
--- a/src/PrefsManager.h
+++ b/src/PrefsManager.h
@@ -115,8 +115,8 @@ enum CourseSortOrders
 enum DefaultFailType
 {
 	FAIL_IMMEDIATE,
-	FAIL_IMMEDIATE_CONTINUE,
-	FAIL_AT_END,
+	FAIL_IMMEDIATECONTINUE,
+	FAIL_ENDOFSONG,
 	FAIL_OFF,
 	NUM_DefaultFailType,
 	DefaultFailType_Invalid
@@ -286,9 +286,7 @@ public:
 
 	/** @brief Enable some quirky behavior used by some older versions of StepMania. */
 	Preference<bool>	m_bQuirksMode;
-	
-	/** @brief The specific failure type to use at the beginning. */
-	Preference<DefaultFailType> m_sDefaultFailType;
+	// Preference<RString> m_sDefaultFailType; // XXX: Fix fail bug?
 
 	// Debug:
 	Preference<bool>	m_bLogToDisk;