Restore old remote server behaviour

A previous commit modified the remote server behaviour to talk to cloud servers.  The code to talk to cloud servers is now separate from the remote servers case and the old remote servers functionality has been restored.