This seems to be more consistent with the service API.
This seems to be more consistent with the service API.