Sync patches w/ upstream

This removes some patches from 4f1b1170ae4d927f2eece4e66ada61648ae7d03b
that no longer apply (have been merged upstream).