Revert two Go PRs#18434

dbartol merged 2 commits intocodeql-cli-2.20.1github/codeql:codeql-cli-2.20.1from

dbartol/revert-gogithub/codeql:dbartol/revert-goCopy head branch name to clipboard