revert go vet fixes that make it incompatible with go 1.0, which I still use on the server