Eli Zaretskii <eliz@gnu.org> writes:

> Then I guess you or Ihor (or both) should try removing that line and
> run with that for a while.

Yup. That's what I am already doing. See the attached diff.

Beware though that I still haven't looked closely into your and Stefan's
emails (it is late here) and I have no idea what I am doing in this
diff.