Back to previous API.

(IE, the previous breaking changes are unbroken.)