I agree, we should revert aaa50018ee and deprecate keeping the behaviour we had for months.