Remove patch that was integrated upstream.