Followup to r64228 - apply restrictions in API.