diff --git a/etcd.go b/etcd.go
index 2306875de..04b970906 100644
--- a/etcd.go
+++ b/etcd.go
@@ -141,30 +141,6 @@ var info *Info
 //
 //------------------------------------------------------------------------------
 
-// sanitizeURL will cleanup a host string in the format hostname:port and
-// attach a schema.
-func sanitizeURL(host string, defaultScheme string) string {
-	// Blank URLs are fine input, just return it
-	if len(host) == 0 {
-		return host
-	}
-
-	p, err := url.Parse(host)
-	if err != nil {
-		fatal(err)
-	}
-
-	// Make sure the host is in Host:Port format
-	_, _, err = net.SplitHostPort(host)
-	if err != nil {
-		fatal(err)
-	}
-
-	p = &url.URL{Host: host, Scheme: defaultScheme}
-
-	return p.String()
-}
-
 //--------------------------------------
 // Main
 //--------------------------------------
diff --git a/util.go b/util.go
index e57dfca59..6a7f4e910 100644
--- a/util.go
+++ b/util.go
@@ -6,7 +6,9 @@ import (
 	"github.com/coreos/etcd/web"
 	"io"
 	"log"
+	"net"
 	"net/http"
+	"net/url"
 	"os"
 	"strconv"
 	"time"
@@ -69,6 +71,30 @@ func encodeJsonResponse(w http.ResponseWriter, status int, data interface{}) {
 	}
 }
 
+// sanitizeURL will cleanup a host string in the format hostname:port and
+// attach a schema.
+func sanitizeURL(host string, defaultScheme string) string {
+	// Blank URLs are fine input, just return it
+	if len(host) == 0 {
+		return host
+	}
+
+	p, err := url.Parse(host)
+	if err != nil {
+		fatal(err)
+	}
+
+	// Make sure the host is in Host:Port format
+	_, _, err = net.SplitHostPort(host)
+	if err != nil {
+		fatal(err)
+	}
+
+	p = &url.URL{Host: host, Scheme: defaultScheme}
+
+	return p.String()
+}
+
 //--------------------------------------
 // Log
 //--------------------------------------