Drop patches, merged upstream.