> Thus, making the customization "official" in this case is the only way
> to "fix" the "regression".
>
> Thanks for working on this.

Here is a quite final patch I believe.  At least, it works
without noticed problems in my tests.