remove now-included patch this partially resolves CVE-2021-40812 (cherry picked from commit d6f49708212822b6a3c0fe598f3a20abf8676990)
remove now-included patch this partially resolves CVE-2021-40812 (cherry picked from commit d6f49708212822b6a3c0fe598f3a20abf8676990)