Revert "Fix an API breakage"

This reverts commit 1a8f31ff8592640a86fa2586c96d3fb1fc27e85a.