Revert "R4: Further de-crappification of player"

This reverts commit 8a39077a64549e4ea326d5035a4f614d2027c3de.