diff --git a/go/analysis/passes/buildtag/buildtag.go b/go/analysis/passes/buildtag/buildtag.go
index b5a2d2775f4..e7434e8fed2 100644
--- a/go/analysis/passes/buildtag/buildtag.go
+++ b/go/analysis/passes/buildtag/buildtag.go
@@ -15,7 +15,6 @@ import (
 
 	"golang.org/x/tools/go/analysis"
 	"golang.org/x/tools/go/analysis/passes/internal/analysisutil"
-	"golang.org/x/tools/internal/versions"
 )
 
 const Doc = "check //go:build and // +build directives"
@@ -371,11 +370,6 @@ func (check *checker) finish() {
 
 // tags reports issues in go versions in tags within the expression e.
 func (check *checker) tags(pos token.Pos, e constraint.Expr) {
-	// Check that constraint.GoVersion is meaningful (>= go1.21).
-	if versions.ConstraintGoVersion == nil {
-		return
-	}
-
 	// Use Eval to visit each tag.
 	_ = e.Eval(func(tag string) bool {
 		if malformedGoTag(tag) {
@@ -393,10 +387,8 @@ func malformedGoTag(tag string) bool {
 		// Check for close misspellings of the "go1." prefix.
 		for _, pre := range []string{"go.", "g1.", "go"} {
 			suffix := strings.TrimPrefix(tag, pre)
-			if suffix != tag {
-				if valid, ok := validTag("go1." + suffix); ok && valid {
-					return true
-				}
+			if suffix != tag && validGoVersion("go1."+suffix) {
+				return true
 			}
 		}
 		return false
@@ -404,15 +396,10 @@ func malformedGoTag(tag string) bool {
 
 	// The tag starts with "go1" so it is almost certainly a GoVersion.
 	// Report it if it is not a valid build constraint.
-	valid, ok := validTag(tag)
-	return ok && !valid
+	return !validGoVersion(tag)
 }
 
-// validTag returns (valid, ok) where valid reports when a tag is valid,
-// and ok reports determining if the tag is valid succeeded.
-func validTag(tag string) (valid bool, ok bool) {
-	if versions.ConstraintGoVersion != nil {
-		return versions.ConstraintGoVersion(&constraint.TagExpr{Tag: tag}) != "", true
-	}
-	return false, false
+// validGoVersion reports when a tag is a valid go version.
+func validGoVersion(tag string) bool {
+	return constraint.GoVersion(&constraint.TagExpr{Tag: tag}) != ""
 }
diff --git a/internal/versions/constraint.go b/internal/versions/constraint.go
deleted file mode 100644
index 179063d4848..00000000000
--- a/internal/versions/constraint.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package versions
-
-import "go/build/constraint"
-
-// ConstraintGoVersion is constraint.GoVersion (if built with go1.21+).
-// Otherwise nil.
-//
-// Deprecate once x/tools is after go1.21.
-var ConstraintGoVersion func(x constraint.Expr) string
diff --git a/internal/versions/constraint_go121.go b/internal/versions/constraint_go121.go
deleted file mode 100644
index 38011407d5f..00000000000
--- a/internal/versions/constraint_go121.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2024 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build go1.21
-// +build go1.21
-
-package versions
-
-import "go/build/constraint"
-
-func init() {
-	ConstraintGoVersion = constraint.GoVersion
-}