Restore remote server behaviour

This change set restores the remote server behaviour that was recently broken.

This does not fix the issue where a remote server can disappear from the list of servers in the preferences upon restart.