Remove now upstreamed patch