diff --git a/GNUmakefile b/GNUmakefile
index eeb72ce54d..37aa0f29fe 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -9,7 +9,7 @@ GOTOOLS = \
 	github.com/axw/gocov/gocov \
 	gopkg.in/matm/v1/gocov-html
 
-GOTAGS ?= consul
+GOTAGS ?=
 GOFILES ?= $(shell go list ./... | grep -v /vendor/)
 GOOS=$(shell go env GOOS)
 GOARCH=$(shell go env GOARCH)
diff --git a/version/version.go b/version/version.go
index 2410d40594..48b3ca4f0d 100644
--- a/version/version.go
+++ b/version/version.go
@@ -11,15 +11,16 @@ var (
 	GitCommit   string
 	GitDescribe string
 
-	// Release versions of the build. These will be filled in by one of the
-	// build tag-specific files.
+	// The main version number that is being run at the moment.
 	//
 	// Version must conform to the format expected by github.com/hashicorp/go-version
-	// for tests to work. Otherwise, the metadata server will not be able to detect
-	// the agent to be a server. The value must be >= '0.8.0' for autopilot to work.
-	// todo(fs): This still feels like a hack but at least the magic values are gone.
-	Version           = "9.9.9"
-	VersionPrerelease = "unknown"
+	// for tests to work.
+	Version = "0.9.3"
+
+	// A pre-release marker for the version. If this is "" (empty string)
+	// then it means that it is a final release. Otherwise, this is a pre-release
+	// such as "dev" (in development), "beta", "rc1", etc.
+	VersionPrerelease = "dev"
 )
 
 // GetHumanVersion composes the parts of the version in a way that's suitable
diff --git a/version/version_base.go b/version/version_base.go
deleted file mode 100644
index f45e177eec..0000000000
--- a/version/version_base.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// +build consul
-
-package version
-
-// NOTE we rely on other "version_*.go" files to be lexically after
-// "version_base.go" in order for this to get properly overridden. Be careful
-// adding new versions and pick a name that will follow "version_base.go".
-func init() {
-	// The main version number that is being run at the moment.
-	Version = "0.9.3"
-
-	// A pre-release marker for the version. If this is "" (empty string)
-	// then it means that it is a final release. Otherwise, this is a pre-release
-	// such as "dev" (in development), "beta", "rc1", etc.
-	VersionPrerelease = "dev"
-}