Client fixes
Revert "Client fixes"

This reverts commit ee61468b5bdf59923f00269ebabdb7b13f7a1a17.
Merge remote-tracking branch 'origin/Multiplayer' into Multiplayer