Remove upstreamer patch