Gns 117

Try #2 at restoring the remote server behaviour.  The previous PR added specific handling for cloud instances, but didn't restore the old behaviour of getRemoteServer().