Ping!  I hope a fix like this can be merged into Emacs 29 still :)