diff --git a/pkg/cli/cmds/nocluster.go b/pkg/cli/cmds/nocluster.go
deleted file mode 100644
index 92b5ff23a0..0000000000
--- a/pkg/cli/cmds/nocluster.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// +build no_etcd
-
-package cmds
-
-const (
-	hideClusterFlags = true
-)
diff --git a/pkg/cli/cmds/server.go b/pkg/cli/cmds/server.go
index 40f48b944c..9da4540709 100644
--- a/pkg/cli/cmds/server.go
+++ b/pkg/cli/cmds/server.go
@@ -10,7 +10,6 @@ import (
 const (
 	defaultSnapshotRentention    = 5
 	defaultSnapshotIntervalHours = 12
-	hideClusterFlags             = true
 )
 
 type Server struct {
@@ -394,21 +393,18 @@ func NewServerCommand(action func(*cli.Context) error) cli.Command {
 			},
 			cli.StringFlag{
 				Name:        "server,s",
-				Hidden:      hideClusterFlags,
 				Usage:       "(experimental/cluster) Server to connect to, used to join a cluster",
 				EnvVar:      version.ProgramUpper + "_URL",
 				Destination: &ServerConfig.ServerURL,
 			},
 			cli.BoolFlag{
 				Name:        "cluster-init",
-				Hidden:      hideClusterFlags,
 				Usage:       "(experimental/cluster) Initialize a new cluster using embedded Etcd",
 				EnvVar:      version.ProgramUpper + "_CLUSTER_INIT",
 				Destination: &ServerConfig.ClusterInit,
 			},
 			cli.BoolFlag{
 				Name:        "cluster-reset",
-				Hidden:      hideClusterFlags,
 				Usage:       "(experimental/cluster) Forget all peers and become sole member of a new cluster",
 				EnvVar:      version.ProgramUpper + "_CLUSTER_RESET",
 				Destination: &ServerConfig.ClusterReset,
diff --git a/pkg/cluster/etcd.go b/pkg/cluster/etcd.go
index 556206d980..18d2130a56 100644
--- a/pkg/cluster/etcd.go
+++ b/pkg/cluster/etcd.go
@@ -1,5 +1,3 @@
-// +build !no_etcd
-
 package cluster
 
 import (