Import new patches
Revert "Import new patches"

This reverts commit d78a75fd6f2cf60a195cfe94edd96787f7ac7622.
Update patches for new upstream
Update patch again
Fix patch again