diff --git a/stepmania/src/NotesWriterSM.cpp b/stepmania/src/NotesWriterSM.cpp
index 75ac5672b4..d3a80aeb25 100644
--- a/stepmania/src/NotesWriterSM.cpp
+++ b/stepmania/src/NotesWriterSM.cpp
@@ -170,9 +170,8 @@ RString NotesWriterSM::GetSMNotesTag( const Song &song, const Steps &in, bool bS
 	lines.push_back( ssprintf( "     %s:", DifficultyToString(in.GetDifficulty()).c_str() ) );
 	lines.push_back( ssprintf( "     %d:", in.GetMeter() ) );
 	
-	int MaxRadar = bSavingCache? NUM_RadarCategory:5;
 	vector<RString> asRadarValues;
-	for( int r=0; r < MaxRadar; r++ )
+	for( int r=0; r < NUM_RadarCategory; r++ )
 		asRadarValues.push_back( ssprintf("%.3f", in.GetRadarValues()[r]) );
 	/* Don't append a newline here; it's added in NoteDataUtil::GetSMNoteDataString.
 	 * If we add it here, then every time we write unmodified data we'll add an extra
diff --git a/stepmania/src/Steps.cpp b/stepmania/src/Steps.cpp
index 74ebfd6fe7..8d00cce47f 100644
--- a/stepmania/src/Steps.cpp
+++ b/stepmania/src/Steps.cpp
@@ -152,9 +152,13 @@ void Steps::CalculateRadarValues( float fMusicLengthSeconds )
 	if( parent != NULL )
 		return;
 
+	// Do write radar values, and leave it up to the reading app whether they want to trust
+	// the cached values without recalculating them.
+	/*
 	// If we're an edit, leave the RadarValues invalid.
 	if( IsAnEdit() )
 		return;
+	*/
 
 	NoteData tempNoteData;
 	this->GetNoteData( tempNoteData );