Clients now properly register with Server

There is definitely a problem with getting the Server's response. Not
sure what is going on there.
Revert "Clients now properly register with Server"

This reverts commit ddcb58a49f162c02b9f25fc2d341c7e474c13f96.
Merge remote-tracking branch 'origin/master'