Ok. I'd like this part of the change to be a separate patch, to separate it from the `new` bugfix.