diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index cebd3a6a7c..0aa48b207e 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -975,39 +975,6 @@ void MusicWheel::Update( float fDeltaTime )
 							GAMESTATE->m_PreferredDifficulty[p] = dc;
 				}
 
-				//
-				// Unselect the current song if this is a course mode.
-				// Unselect the current course if this is a song sort.
-				//
-				/* If we do this, then switching to course mode and back will put you
-				 * back on the default song.  From the CVS commit, this looks like it
-				 * was originally to fix ScreenOptionsMaster difficulty display, and
-				 * isn't needed anymore ... -glenn */
-/*				switch( GAMESTATE->m_SortOrder )
-				{
-				case SORT_PREFERRED:
-				case SORT_GROUP:
-				case SORT_TITLE:
-				case SORT_BPM:
-				case SORT_GRADE:
-				case SORT_ARTIST:
-				case SORT_MOST_PLAYED:
-				case SORT_ROULETTE:
-				case SORT_EASY_METER:
-				case SORT_MEDIUM_METER:
-				case SORT_HARD_METER:
-				case SORT_CHALLENGE_METER:
-					GAMESTATE->m_pCurCourse = NULL;
-					break;
-				case SORT_ALL_COURSES:
-				case SORT_NONSTOP_COURSES:
-				case SORT_ONI_COURSES:
-				case SORT_ENDLESS_COURSES:
-					GAMESTATE->m_pCurSong = NULL;
-					break;
-				}
-*/
-
 				SCREENMAN->PostMessageToTopScreen( SM_SongChanged, 0 );
 				RebuildMusicWheelItems();
 				TweenOnScreen(true);