drop upstream patch