Removed dependency on changing the server url.