diff --git a/p2p/local_listener.go b/p2p/local_listener.go
index 88c76ce06..64d75f477 100644
--- a/p2p/local_listener.go
+++ b/p2p/local_listener.go
@@ -4,11 +4,9 @@ import (
 	"errors"
 	"sync"
 
-	net "gx/ipfs/QmQSbtGXCyNrj34LWL8EgXyNNYDZ8r3SwQcpW5pPxVhLnM/go-libp2p-net"
 	peer "gx/ipfs/QmQsErDt8Qgw1XrsXf2BpEzDgGWtB1YLsTAARBup5b6B9W/go-libp2p-peer"
 	ma "gx/ipfs/QmYmsdtJ3HsodkePE3eU3TsCaP2YvPZJ4LoXnNkDE5Tpt7/go-multiaddr"
 	"gx/ipfs/QmZNkThpqfVXs9GNbexPrfBbXSLNYeKrE7jwFM2oqHbyqN/go-libp2p-protocol"
-	p2phost "gx/ipfs/QmfH9FKYv3Jp1xiyL8sPchGBUBg6JA6XviwajAo3qgnT3B/go-libp2p-host"
 )
 
 // ListenerLocal listens for connections and proxies them to a target
@@ -31,40 +29,12 @@ type ListenersLocal struct {
 	starting  map[string]struct{}
 }
 
-func newListenerRegistry(id peer.ID, host p2phost.Host) *ListenersLocal {
+func newListenerRegistry(id peer.ID) *ListenersLocal {
 	reg := &ListenersLocal{
 		Listeners: map[string]ListenerLocal{},
 		starting:  map[string]struct{}{},
 	}
 
-	addr, err := ma.NewMultiaddr(maPrefix + id.Pretty())
-	if err != nil {
-		panic(err)
-	}
-
-	host.SetStreamHandlerMatch("/x/", func(p string) bool {
-		reg.RLock()
-		defer reg.RUnlock()
-
-		for _, l := range reg.Listeners {
-			if l.ListenAddress().Equal(addr) && string(l.Protocol()) == p {
-				return true
-			}
-		}
-
-		return false
-	}, func(stream net.Stream) {
-		reg.RLock()
-		defer reg.RUnlock()
-
-		for _, l := range reg.Listeners {
-			if l.ListenAddress().Equal(addr) && l.Protocol() == stream.Protocol() {
-				go l.(*remoteListener).handleStream(stream)
-				return
-			}
-		}
-	})
-
 	return reg
 }
 
diff --git a/p2p/p2p.go b/p2p/p2p.go
index 7c69d1c26..a20844258 100644
--- a/p2p/p2p.go
+++ b/p2p/p2p.go
@@ -27,7 +27,7 @@ func NewP2P(identity peer.ID, peerHost p2phost.Host, peerstore pstore.Peerstore)
 		peerHost:  peerHost,
 		peerstore: peerstore,
 
-		ListenersLocal: newListenerRegistry(identity, peerHost),
+		ListenersLocal: newListenerRegistry(identity),
 		ListenersP2P:   newListenerP2PRegistry(identity, peerHost),
 
 		Streams: &StreamRegistry{
diff --git a/p2p/p2p_listener.go b/p2p/p2p_listener.go
index 7b1d96b84..7f84c2635 100644
--- a/p2p/p2p_listener.go
+++ b/p2p/p2p_listener.go
@@ -12,12 +12,13 @@ import (
 )
 
 // Listener listens for connections and proxies them to a target
-type P2PListener interface {
+type ListenerP2P interface {
 	Protocol() protocol.ID
 	ListenAddress() ma.Multiaddr
 	TargetAddress() ma.Multiaddr
 
 	start() error
+	handleStream(remote net.Stream)
 
 	// Close closes the listener. Does not affect child streams
 	Close() error
@@ -27,13 +28,13 @@ type P2PListener interface {
 type ListenersP2P struct {
 	sync.RWMutex
 
-	Listeners map[protocol.ID]ListenerLocal
+	Listeners map[protocol.ID]ListenerP2P
 	starting  map[protocol.ID]struct{}
 }
 
 func newListenerP2PRegistry(id peer.ID, host p2phost.Host) *ListenersP2P {
 	reg := &ListenersP2P{
-		Listeners: map[protocol.ID]ListenerLocal{},
+		Listeners: map[protocol.ID]ListenerP2P{},
 		starting:  map[protocol.ID]struct{}{},
 	}
 
@@ -59,7 +60,7 @@ func newListenerP2PRegistry(id peer.ID, host p2phost.Host) *ListenersP2P {
 
 		for _, l := range reg.Listeners {
 			if l.ListenAddress().Equal(addr) && l.Protocol() == stream.Protocol() {
-				go l.(*remoteListener).handleStream(stream)
+				go l.handleStream(stream)
 				return
 			}
 		}
@@ -69,7 +70,7 @@ func newListenerP2PRegistry(id peer.ID, host p2phost.Host) *ListenersP2P {
 }
 
 // Register registers listenerInfo into this registry and starts it
-func (r *ListenersP2P) Register(l ListenerLocal) error {
+func (r *ListenersP2P) Register(l ListenerP2P) error {
 	r.Lock()
 
 	k := l.Protocol()
diff --git a/p2p/remote.go b/p2p/remote.go
index 26b401ba0..00971481b 100644
--- a/p2p/remote.go
+++ b/p2p/remote.go
@@ -23,7 +23,7 @@ type remoteListener struct {
 }
 
 // ForwardRemote creates new p2p listener
-func (p2p *P2P) ForwardRemote(ctx context.Context, proto protocol.ID, addr ma.Multiaddr) (P2PListener, error) {
+func (p2p *P2P) ForwardRemote(ctx context.Context, proto protocol.ID, addr ma.Multiaddr) (ListenerP2P, error) {
 	listener := &remoteListener{
 		p2p: p2p,