diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp
index 80d59a72ca..aeda97bf38 100644
--- a/stepmania/src/LifeMeterBar.cpp
+++ b/stepmania/src/LifeMeterBar.cpp
@@ -253,16 +253,6 @@ void LifeMeterBar::ChangeLife( float fDeltaLife )
 			fDeltaLife /= m_fLifeDifficulty;
 		break;
 	}
-
-	// check if this step would empty the bar
-	if( m_fLifePercentage + fDeltaLife <= 0  &&  m_fLifePercentage > 0 )
-	{
-		/* Increase by m_iRegenComboAfterFail; never push it beyond m_iMaxRegenComboAfterFail
-		 * but don't reduce it if it's already past. */
-		int iNewComboToRegainLife = m_iComboToRegainLife + PREFSMAN->m_iRegenComboAfterFail;
-		iNewComboToRegainLife = min( (int)PREFSMAN->m_iMaxRegenComboAfterFail, iNewComboToRegainLife );
-		m_iComboToRegainLife = max( m_iComboToRegainLife, iNewComboToRegainLife );
-	}
 	
 	m_fLifePercentage += fDeltaLife;
 	CLAMP( m_fLifePercentage, 0, 1 );
diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index 587f470d80..e9b4c89bb0 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -296,9 +296,7 @@ PrefsManager::PrefsManager() :
 	m_fLifeDifficultyScale	( "LifeDifficultyScale",	1.0f ),
 
 
-	m_iRegenComboAfterFail		( "RegenComboAfterFail",	10 ),
 	m_iRegenComboAfterMiss		( "RegenComboAfterMiss",	5 ),
-	m_iMaxRegenComboAfterFail	( "MaxRegenComboAfterFail",	10 ),
 	m_iMaxRegenComboAfterMiss	( "MaxRegenComboAfterMiss",	10 ),
 	m_bMercifulDrain		( "MercifulDrain",		true ),	// negative life deltas are scaled by the players life percentage
 	m_bMinimum1FullSongInCourses	( "Minimum1FullSongInCourses",	false ),	// FEoS for 1st song, FailImmediate thereafter
diff --git a/stepmania/src/PrefsManager.h b/stepmania/src/PrefsManager.h
index 95b89f3751..65c6c46677 100644
--- a/stepmania/src/PrefsManager.h
+++ b/stepmania/src/PrefsManager.h
@@ -138,9 +138,7 @@ public:
 	Preference<float>	m_fLifeDifficultyScale;
 
 	// Whoever added these: Please add a comment saying what they do. -Chris
-	Preference<int>		m_iRegenComboAfterFail;
 	Preference<int>		m_iRegenComboAfterMiss;
-	Preference<int>		m_iMaxRegenComboAfterFail;
 	Preference<int>		m_iMaxRegenComboAfterMiss;
 	Preference<bool>	m_bMercifulDrain;	// negative life deltas are scaled by the players life percentage
 	Preference<bool>	m_bMinimum1FullSongInCourses;	// FEoS for 1st song, FailImmediate thereafter