Eli Zaretskii <eliz@gnu.org> writes:

[...]

>> Here is the new version.  I also modified the commit message a bit.
>
> LGTM, thanks.

Sorry, here is another version.  WDYT?  Maybe, Drew you could test it to
see if it fixes the bug for you.