diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index 40eb7a2c44..c9a7cd23c3 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -49,7 +49,7 @@
 
 #define CACHE_DIR BASE_PATH "Cache" SLASH
 
-const int FILE_CACHE_VERSION = 129;	// increment this when Song or Steps changes to invalidate cache
+const int FILE_CACHE_VERSION = 130;	// increment this when Song or Steps changes to invalidate cache
 
 const float DEFAULT_MUSIC_SAMPLE_LENGTH = 12.f;
 
@@ -1290,28 +1290,7 @@ static int GetSongSortDifficulty(const Song *pSong)
 	vector<Steps*> aNotes;
 	pSong->GetSteps( aNotes, GAMESTATE->GetCurrentStyleDef()->m_StepsType );
 
-	// sort by anything but beginner
-	/* This makes the sort a little odd; songs can end up in unintuitive places because,
-	 * for example, of a HARD difficulty with an incorrectly-set meter of 1, or because
-	 * of challenge steps. */
-/*
-	int iEasiestMeter = 1000;	// infinity
-	for( unsigned i=0; i<aNotes.size(); i++ )
-	{
-		if(aNotes[i]->GetDifficulty() == DIFFICULTY_BEGINNER)
-			continue;
-
-		iEasiestMeter = min( iEasiestMeter, aNotes[i]->GetMeter() );
-	}
-	// odd case where there are only beginner steps... what to do? should probably
-	// act just like it was a 1-footer, even if the beginner steps aren't	
-	if( iEasiestMeter1 == 1000 )
-		iEasiestMeter1 = 1;
-	if( iEasiestMeter2 == 1000 )
-		iEasiestMeter2 = 1;
-*/
-
-	/* Instead, always sort by the first difficulty found in the following order: */
+	/* Sort by the first difficulty found in the following order: */
 	const Difficulty d[] = { DIFFICULTY_EASY, DIFFICULTY_MEDIUM, DIFFICULTY_HARD,
 		DIFFICULTY_CHALLENGE, DIFFICULTY_INVALID };