diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp
index 226a061528..16fe75a5f0 100644
--- a/stepmania/src/NoteField.cpp
+++ b/stepmania/src/NoteField.cpp
@@ -88,10 +88,11 @@ void NoteField::Load( const NoteData* pNoteData, PlayerNumber pn, int iFirstPixe
 	this->CopyAll( pNoteData );
 	ASSERT( GetNumTracks() == GAMESTATE->GetCurrentStyleDef()->m_iColsPerPlayer );
 
-	/* Cache the default note skin.  It's up to other code to cache any other skins
-	 * that might be used, such as ones assigned as attacks in battle modes. */
-	LOG->Trace("cache '%s'", GAMESTATE->m_PlayerOptions[pn].m_sNoteSkin.c_str());
-	CacheNoteSkin( GAMESTATE->m_PlayerOptions[pn].m_sNoteSkin );
+	/* Cache note skins. */
+	vector<CString> skins;
+	GAMESTATE->GetAllUsedNoteSkins( skins );
+	for( unsigned i=0; i < skins.size(); ++i )
+		CacheNoteSkin( skins[i] );
 
 	RefreshBeatToNoteSkin();
 }
diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index c4b27816c5..fe038e1b41 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -92,8 +92,6 @@ PlayerMinus::~PlayerMinus()
 
 void PlayerMinus::Load( PlayerNumber pn, const NoteData* pNoteData, LifeMeter* pLM, CombinedLifeMeter* pCombinedLM, ScoreDisplay* pScore, Inventory* pInventory, ScoreKeeper* pPrimaryScoreKeeper, ScoreKeeper* pSecondaryScoreKeeper, NoteFieldPlus* pNoteField )
 {
-	GAMESTATE->ResetNoteSkins();
-
 	//LOG->Trace( "PlayerMinus::Load()", );
 
 	m_PlayerNumber = pn;
@@ -150,29 +148,6 @@ void PlayerMinus::Load( PlayerNumber pn, const NoteData* pNoteData, LifeMeter* p
 	m_pNoteField->Load( this, pn, iStartDrawingAtPixels, iStopDrawingAtPixels, fNoteFieldHeight );
 	m_ArrowBackdrop.SetPlayer( pn );
 
-	/* Cache note skins that are used as attacks. */
-	switch( GAMESTATE->m_PlayMode )
-	{
-	case PLAY_MODE_BATTLE:
-	case PLAY_MODE_RAVE:
-		for( int p=0; p<NUM_PLAYERS; p++ )
-		{
-			for( int al=0; al<NUM_ATTACK_LEVELS; al++ )
-			{
-				Character *ch = GAMESTATE->m_pCurCharacters[p];
-				ASSERT( ch );
-				CString* asAttacks = ch->m_sAttacks[al];
-				for( int att = 0; att < NUM_ATTACKS_PER_LEVEL; ++att )
-				{
-					PlayerOptions po;
-					po.FromString( asAttacks[att] );
-					if( po.m_sNoteSkin != "" )
-						m_pNoteField->CacheNoteSkin( po.m_sNoteSkin );
-				}
-			}
-		}
-	}	
-
 	const bool bReverse = GAMESTATE->m_PlayerOptions[pn].GetReversePercentForColumn(0) == 1;
 	bool bPlayerUsingBothSides = GAMESTATE->GetCurrentStyleDef()->m_StyleType==StyleDef::ONE_PLAYER_TWO_CREDITS;
 	m_Combo.SetX( COMBO_X(m_PlayerNumber,bPlayerUsingBothSides) );