This should go in should_check_remote_server