This deprecates the currently unused API.

Patch attached.