Remove patch that was integrated upstream.
dd new file from upstream.
delete missing clone!