diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go
index dc3115718ce..1f0780ed59f 100644
--- a/cmd/kube-apiserver/app/server.go
+++ b/cmd/kube-apiserver/app/server.go
@@ -41,7 +41,6 @@ import (
 	"k8s.io/kubernetes/pkg/apis/autoscaling"
 	"k8s.io/kubernetes/pkg/apis/batch"
 	"k8s.io/kubernetes/pkg/apis/extensions"
-	"k8s.io/kubernetes/pkg/apiserver"
 	"k8s.io/kubernetes/pkg/apiserver/authenticator"
 	"k8s.io/kubernetes/pkg/capabilities"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
@@ -126,7 +125,7 @@ func Run(s *options.ServerRunOptions) error {
 
 	// Setup tunneler if needed
 	var tunneler genericapiserver.Tunneler
-	var proxyDialerFn apiserver.ProxyDialerFunc
+	var proxyDialerFn utilnet.DialFunc
 	if len(s.SSHUser) > 0 {
 		// Get ssh key distribution func, if supported
 		var installSSH genericapiserver.InstallSSHKey
diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go
index d4c91d7d377..04be53ac1f9 100644
--- a/pkg/apiserver/apiserver.go
+++ b/pkg/apiserver/apiserver.go
@@ -22,7 +22,6 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"net"
 	"net/http"
 	"path"
 	rt "runtime"
@@ -106,16 +105,6 @@ type APIGroupVersion struct {
 	ResourceLister APIResourceLister
 }
 
-type ProxyDialerFunc func(network, addr string) (net.Conn, error)
-
-// TODO: Pipe these in through the apiserver cmd line
-const (
-	// Minimum duration before timing out read/write requests
-	MinTimeoutSecs = 300
-	// Maximum duration before timing out read/write requests
-	MaxTimeoutSecs = 600
-)
-
 // staticLister implements the APIResourceLister interface
 type staticLister struct {
 	list []metav1.APIResource
diff --git a/pkg/kubelet/client/kubelet_client.go b/pkg/kubelet/client/kubelet_client.go
index 612dca57e97..a1265caf3b8 100644
--- a/pkg/kubelet/client/kubelet_client.go
+++ b/pkg/kubelet/client/kubelet_client.go
@@ -17,7 +17,6 @@ limitations under the License.
 package client
 
 import (
-	"net"
 	"net/http"
 	"strconv"
 	"time"
@@ -50,7 +49,7 @@ type KubeletClientConfig struct {
 	HTTPTimeout time.Duration
 
 	// Dial is a custom dialer used for the client
-	Dial func(net, addr string) (net.Conn, error)
+	Dial utilnet.DialFunc
 }
 
 // ConnectionInfo provides the information needed to connect to a kubelet
diff --git a/pkg/util/proxy/dial_test.go b/pkg/util/proxy/dial_test.go
index d5103452044..e9aeb9fa9cb 100644
--- a/pkg/util/proxy/dial_test.go
+++ b/pkg/util/proxy/dial_test.go
@@ -44,7 +44,7 @@ func TestDialURL(t *testing.T) {
 
 	testcases := map[string]struct {
 		TLSConfig   *tls.Config
-		Dial        func(network, addr string) (net.Conn, error)
+		Dial        utilnet.DialFunc
 		ExpectError string
 	}{
 		"insecure": {