I just pushed it to wip-hurd.

Make sure to remind us to apply it in the next core-updates cycle.

Thanks!

Ludo’.