rod-hynes Backport fix for CVE-2021-34558 (#80 )

See: https://groups.google.com/g/golang-dev/c/5LJ2V7rd-Ag/m/YGLHVBZ6AAAJ

0b2885c