Richard Stallman <rms@gnu.org> writes:

>     This simple patch fixed this -- can I commit it?
>
> The patch looks correct.

Following Stefan's advice, I applied this patch instead: