stacks: remove upstreamed patch