Isn't this a BC break here? If it is acceptable, it should be documented in the `UPGRADE.md` at least.