The author Samuel Thibault confirmed the patch can be dropped due
to the issue being fixed by upstream by now.