Bug 18729: (follow-up) Adjust API to new spec