diff --git a/pkg/endpoints/handlers/namer.go b/pkg/endpoints/handlers/namer.go
index 191417060..a9fe8fe21 100644
--- a/pkg/endpoints/handlers/namer.go
+++ b/pkg/endpoints/handlers/namer.go
@@ -41,9 +41,6 @@ type ScopeNamer interface {
 type ContextBasedNaming struct {
 	Namer         runtime.Namer
 	ClusterScoped bool
-
-	SelfLinkPathPrefix string
-	SelfLinkPathSuffix string
 }
 
 // ContextBasedNaming implements ScopeNamer
diff --git a/pkg/endpoints/installer.go b/pkg/endpoints/installer.go
index af8418e53..e4b2221fc 100644
--- a/pkg/endpoints/installer.go
+++ b/pkg/endpoints/installer.go
@@ -19,7 +19,6 @@ package endpoints
 import (
 	"fmt"
 	"net/http"
-	gpath "path"
 	"reflect"
 	"sort"
 	"strings"
@@ -428,10 +427,8 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag
 		apiResource.Namespaced = false
 		apiResource.Kind = resourceKind
 		namer := handlers.ContextBasedNaming{
-			Namer:              a.group.Namer,
-			ClusterScoped:      true,
-			SelfLinkPathPrefix: gpath.Join(a.prefix, resource) + "/",
-			SelfLinkPathSuffix: suffix,
+			Namer:         a.group.Namer,
+			ClusterScoped: true,
 		}
 
 		// Handler for standard REST verbs (GET, PUT, POST and DELETE).
@@ -477,10 +474,8 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag
 		apiResource.Namespaced = true
 		apiResource.Kind = resourceKind
 		namer := handlers.ContextBasedNaming{
-			Namer:              a.group.Namer,
-			ClusterScoped:      false,
-			SelfLinkPathPrefix: gpath.Join(a.prefix, namespaceParamName) + "/",
-			SelfLinkPathSuffix: itemPathSuffix,
+			Namer:         a.group.Namer,
+			ClusterScoped: false,
 		}
 
 		actions = appendIf(actions, action{"LIST", resourcePath, resourceParams, namer, false}, isLister)