diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp
index 0ceee72f65..5ba8eb0032 100644
--- a/stepmania/src/SongManager.cpp
+++ b/stepmania/src/SongManager.cpp
@@ -663,9 +663,12 @@ void SongManager::Cleanup()
 	}
 
 	// FIXME
-//	/* Erase cached course info. */
-//	for( unsigned i=0; i < m_pCourses.size(); i++ )
-//		m_pCourses[i]->ClearCache();
+	/* Why was this commented out?  If this isn't done, we'll have stale Steps* in
+	 * course caches, and we'll crash later. */
+	/* Erase cached course info. */
+	for( unsigned i=0; i < m_pCourses.size(); i++ )
+		m_pCourses[i]->RegenTrails();
+	StepsID::FlushCache();
 }
 
 void SongManager::RegenRandomTrailEntries()