Created by: jhchabran
Another attempt at fixing the golangci-lint weird depguard issues.
green build.