Revert "Revert "R4: Further de-crappification of player""

This reverts commit 3cacd5a218aed2bdad9affca6bfb3741012357d4.