Use the upstream patch