Remove (sections of) patches pulled in by FreeBSD