In commit 31c44296 this patch was erroneously removed: the restored patch was *not* upstreamed, so we still need to apply it.