Also, drop some patches merged upstream. Reviewed by: mat Approved by: vg (maintainer) via IRC Differential Revision: D5676