Revert "go-lint compliant and more idiomatic."

This reverts commit 3fbd40cf48a1870c0dc1054e1229f05722dc54b0.