Remove patch that was committed upstream.