Restore functionality to connect to server from command-line