Merge "Revert change to get_remote_client()"