Merge "Remove _migrate_server_to's return value"