Clean up the patches / redo them.

This package has known vulnerabilities, please investigate and fix if possible:
 CVE-2021-45844, CVE-2021-45845
