Revert Player

Merging FacadeGone had reverted a bunch of changes with various files;
this is just a fix for Player.