Renumber patches due to upstream changes.
Remove an old patch used to fix a compile problem.