Revert 91b5a8b..d7edbb9

This rolls back to commit 91b5a8bfbcef82bdc3918e51346b2505fab90f63.
new player