Revert getRemoteServers call
Add in old remote server code