Adapt to latest git.
Remove another obsolete patch.