diff --git a/e b/e
index 8d05f0c1b242d..fd2d5874e5acb 160000
--- a/e
+++ b/e
@@ -1 +1 @@
-Subproject commit 8d05f0c1b242d7cc6ccf6d8fc1f73329a8687f7b
+Subproject commit fd2d5874e5acb10d9e8ba8141d21d1bb488f37b3
diff --git a/lib/proxy/peer/server.go b/lib/proxy/peer/server.go
index 47dfb5bd8126c..0952e18a341c9 100644
--- a/lib/proxy/peer/server.go
+++ b/lib/proxy/peer/server.go
@@ -29,6 +29,7 @@ import (
 	"github.com/gravitational/teleport"
 	"github.com/gravitational/teleport/api/client/proto"
 	"github.com/gravitational/teleport/api/metadata"
+	"github.com/gravitational/teleport/api/utils/grpc/interceptors"
 	"github.com/gravitational/teleport/lib/auth"
 	"github.com/gravitational/teleport/lib/utils"
 )
@@ -131,7 +132,7 @@ func NewServer(config ServerConfig) (*Server, error) {
 	server := grpc.NewServer(
 		grpc.Creds(newServerCredentials(credentials.NewTLS(config.TLSConfig))),
 		grpc.StatsHandler(newStatsHandler(reporter)),
-		grpc.ChainStreamInterceptor(metadata.StreamServerInterceptor, utils.GRPCServerStreamErrorInterceptor),
+		grpc.ChainStreamInterceptor(metadata.StreamServerInterceptor, interceptors.GRPCServerStreamErrorInterceptor),
 		grpc.KeepaliveParams(keepalive.ServerParameters{
 			Time:    peerKeepAlive,
 			Timeout: peerTimeout,
diff --git a/lib/utils/grpc.go b/lib/utils/grpc.go
index 2a57e2b9f3669..e1e845ea2db69 100644
--- a/lib/utils/grpc.go
+++ b/lib/utils/grpc.go
@@ -21,16 +21,6 @@ import (
 
 	"github.com/gravitational/trace"
 	"google.golang.org/grpc"
-
-	"github.com/gravitational/teleport/api/utils/grpc/interceptors"
-)
-
-// TODO(Joerger): Remove these aliases once /e no longer depends on them.
-var (
-	GRPCServerUnaryErrorInterceptor  = interceptors.GRPCServerUnaryErrorInterceptor
-	GRPCClientUnaryErrorInterceptor  = interceptors.GRPCClientUnaryErrorInterceptor
-	GRPCServerStreamErrorInterceptor = interceptors.GRPCServerStreamErrorInterceptor
-	GRPCClientStreamErrorInterceptor = interceptors.GRPCClientStreamErrorInterceptor
 )
 
 // NewGRPCDummyClientConnection returns an implementation of grpc.ClientConnInterface