Fix some no-longer-valid (but needed) patches. Reviewed by: feld, mat (mentors) Approved by: feld (mentor) Differential Revision: https://reviews.freebsd.org/D10392