Please don't change the public API here, this breaks BC and is unacceptable.