Revert "Cleaned up joining the server"

This reverts commit 34d7d5b9f80c5cb005550e5de00a1b35ef8920d5.