Clean up code smell
Very slightly alter the API
Revert API
Very slightly alter the API