Let's try that again, this time without breaking the API.