(In reply to comment #5)
> Does this patch help?

Yes, this seems to do the trick. But as it's a work-around I'm unsure about
closing this as fixed.