diff --git a/src/PlayerState.cpp b/src/PlayerState.cpp
index e66a311a35..4a12a613ac 100644
--- a/src/PlayerState.cpp
+++ b/src/PlayerState.cpp
@@ -5,6 +5,7 @@
 #include "RageLog.h"
 #include "RadarValues.h"
 #include "Steps.h"
+//#include "NoteSkinManager.h" // not needed yet, but will be soon -aj
 
 PlayerState::PlayerState()
 {
@@ -28,6 +29,9 @@ void PlayerState::Reset()
 
 	m_iCpuSkill = 5;
 
+	m_iNoteSkinColSpacing = 0;
+	m_iNoteSkinArrowSize = 0;
+
 	m_iLastPositiveSumOfAttackLevels = 0;
 	m_fSecondsUntilAttacksPhasedOut = 0;
 	m_bAttackBeganThisUpdate = false;
@@ -189,9 +193,10 @@ int PlayerState::GetSumOfActiveAttackLevels() const
 	return iSum;
 }
 
-/*
+
 void PlayerState::LoadNoteSkinMetrics()
 {
+	/*
 	// Read metrics from current noteskin for setting row/col spacing and
 	// arrow size (originally from StepMania AMX)
 
@@ -206,8 +211,8 @@ void PlayerState::LoadNoteSkinMetrics()
 	// todo: allow per-column spacing values? -aj
 	m_iNoteSkinColSpacing = NOTESKIN->GetMetricI( m_sNoteSkin, sStepsType, "ColSpacing" );
 	m_iNoteSkinArrowSize = NOTESKIN->GetMetricI( m_sNoteSkin, sStepsType, "ArrowSize" );
+	*/
 }
-*/
 
 // lua start
 #include "LuaBinding.h"
diff --git a/src/PlayerState.h b/src/PlayerState.h
index 86958d40d2..f5d4ceff22 100644
--- a/src/PlayerState.h
+++ b/src/PlayerState.h
@@ -46,12 +46,10 @@ public:
 	/** @brief The PlayerOptions presently in use by the Player. */
 	ModsGroup<PlayerOptions>	m_PlayerOptions;
 
-	// Metricable noteskin things
-	/*
+	// Metricable noteskin stuff
 	void LoadNoteSkinMetrics();
 	int m_iNoteSkinColSpacing;
 	int m_iNoteSkinArrowSize;
-	*/
 	// not sure I want to let noteskins change row spacing, as that changes how
 	// the speed mods work... -aj
 	//int m_iNoteSkinRowSpacing;