This is not just a docstring fix though, is it?

I absolutely agree that the current API is very odd, but I worry about how "safe" it is to change this (keeping in mind 3rd party apps might rely on this).