Remove upstreamed patch