Remove custom_remote_type for now.