diff --git a/tlsconfig/certpool_go17.go b/tlsconfig/certpool.go
similarity index 95%
rename from tlsconfig/certpool_go17.go
rename to tlsconfig/certpool.go
index 1ca0965e0..f84c624ba 100644
--- a/tlsconfig/certpool_go17.go
+++ b/tlsconfig/certpool.go
@@ -1,5 +1,3 @@
-// +build go1.7
-
 package tlsconfig
 
 import (
diff --git a/tlsconfig/certpool_other.go b/tlsconfig/certpool_other.go
deleted file mode 100644
index 1ff81c333..000000000
--- a/tlsconfig/certpool_other.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build !go1.7
-
-package tlsconfig
-
-import (
-	"crypto/x509"
-)
-
-// SystemCertPool returns an new empty cert pool,
-// accessing system cert pool is supported in go 1.7
-func SystemCertPool() (*x509.CertPool, error) {
-	return x509.NewCertPool(), nil
-}