This is a BC break. We can't do this in version 2.