We can break backwards-compatibility here, the API is not frozen yet and the fix is trivial.