Revert part of 55b23255ed03aa18a7994ee3a0f84187ea0a4751 so that player
properly renders