Revert "Always use PlayerState's own timing because of visual delay."

This reverts commit 8edca26493.

src/PlayerState.cpp

@@ -196,8 +196,9 @@ int PlayerState::GetSumOfActiveAttackLevels() const
 
 const SongPosition &PlayerState::GetDisplayedPosition() const
 {
-	// Player state should always use its own timing because of custom Visual Delay options.
+	if( GAMESTATE->m_bIsUsingStepTiming )
-	return m_Position;
+		return m_Position;
+	return GAMESTATE->m_Position;
 }
 
 const TimingData &PlayerState::GetDisplayedTiming() const