Revert "Fix rare deadlock on player join" - this kinda' breaks logging in.

This reverts commit e42f604a66c7797c0361b52afe0e77edbb0129ab.