Break the API in a different way, for performance.