remove a patche committed upstream add a patch (committed upstream) to fix a use-after-free ok jca@ on a similar diff