Remove unneeded patch (merged upstream)