Remove patch merged upstream.