I applied a modified version of your patch (to remove the obsolete patch
from the sources) on the lisp-team branch.
When the CI machines have rebuilt the dependents, we'll merge the
lisp-team branch into the master branch.