s3-server_id: only include server_id where needed.