diff --git a/addr/addr.go b/addr/addr.go
index c0c4851c26d585a1900f97b207358225f6c8a2cd..857b0f72897086f8b2d2064ac8818563ddf786ee 100644
--- a/addr/addr.go
+++ b/addr/addr.go
@@ -6,8 +6,8 @@ import (
 	logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
 
 	manet "QmU5s159q8cZuM1f9Vqti4LHu6y8zyVc5dxv2py81sdp6Q/go-multiaddr-net"
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
-	context "golang.org/x/net/context"
 )
 
 var log = logging.Logger("github.com/ipfs/go-libp2p/p2p/net/swarm/addr")
diff --git a/dial_test.go b/dial_test.go
index 632ceb7af8a30f7e6acd8102b3da3e6f1ad0367c..027e7945cb34cc5ad6b642064effd870189fcc79 100644
--- a/dial_test.go
+++ b/dial_test.go
@@ -14,8 +14,8 @@ import (
 	ci "util/testutil/ci"
 
 	manet "QmU5s159q8cZuM1f9Vqti4LHu6y8zyVc5dxv2py81sdp6Q/go-multiaddr-net"
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
-	context "golang.org/x/net/context"
 )
 
 func acceptAndHang(l net.Listener) {
diff --git a/peers_test.go b/peers_test.go
index 29099de46f477b8867faa282a723cb18313365fc..0068b37901f899c831316cac641e939396a3dc21 100644
--- a/peers_test.go
+++ b/peers_test.go
@@ -5,8 +5,8 @@ import (
 
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
-	context "golang.org/x/net/context"
 )
 
 func TestPeers(t *testing.T) {
diff --git a/simul_test.go b/simul_test.go
index 7adc022f8f68070ef5063bf283c96920e40eaf30..549dad4ff809f1865047b52b905cb332e6ff0ba1 100644
--- a/simul_test.go
+++ b/simul_test.go
@@ -9,8 +9,8 @@ import (
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	ci "util/testutil/ci"
 
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
-	context "golang.org/x/net/context"
 )
 
 func TestSimultOpen(t *testing.T) {
diff --git a/swarm.go b/swarm.go
index 2fcd275675dce43d213297f2fae2101fae786dbb..e5424802f7df72f254b055de8ab5e08259567327 100644
--- a/swarm.go
+++ b/swarm.go
@@ -16,15 +16,15 @@ import (
 	transport "github.com/ipfs/go-libp2p/p2p/net/transport"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
+	"QmSir6qPL1tjuxd8LkR8VZq6v625ExAUVs2eCLeqQuaPGU/goprocess"
+	goprocessctx "QmSir6qPL1tjuxd8LkR8VZq6v625ExAUVs2eCLeqQuaPGU/goprocess/context"
 	mafilter "QmYWqTn1i8yv9QRDzGPJ2yRudKzYCaC5Aqasbm8vwaG92E/multiaddr-filter"
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
 	ps "github.com/jbenet/go-peerstream"
 	pst "github.com/jbenet/go-stream-muxer"
 	psmss "github.com/jbenet/go-stream-muxer/multistream"
-	"github.com/jbenet/goprocess"
-	goprocessctx "github.com/jbenet/goprocess/context"
 	prom "github.com/prometheus/client_golang/prometheus"
-	context "golang.org/x/net/context"
 
 	logging "QmWRypnfEwrgH4k93KEHN5hng7VjKYkWmzDYRuTZeh2Mgh/go-log"
 )
diff --git a/swarm_addr_test.go b/swarm_addr_test.go
index 0b0d6fffa5800296fe303acc4f8327239643883f..ec5c6576facbfd956cbeca72819507ceb1a0d6b1 100644
--- a/swarm_addr_test.go
+++ b/swarm_addr_test.go
@@ -8,8 +8,8 @@ import (
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	testutil "util/testutil"
 
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
-	context "golang.org/x/net/context"
 )
 
 func TestFilterAddrs(t *testing.T) {
diff --git a/swarm_conn.go b/swarm_conn.go
index be95a4282bae040f4266af479bdc2daf296413f2..7b9c920faed8dde549b507c0a80ce3f4c8e6bf01 100644
--- a/swarm_conn.go
+++ b/swarm_conn.go
@@ -8,9 +8,9 @@ import (
 	conn "github.com/ipfs/go-libp2p/p2p/net/conn"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
 	ps "github.com/jbenet/go-peerstream"
-	context "golang.org/x/net/context"
 )
 
 // a Conn is a simple wrapper around a ps.Conn that also exposes
diff --git a/swarm_dial.go b/swarm_dial.go
index 2bedebc2c8b35d0a0f8f0f21d0a08a4137ed6eb5..3c7aa01d3175495047512ee2c4fffe651b3e3cf8 100644
--- a/swarm_dial.go
+++ b/swarm_dial.go
@@ -14,8 +14,8 @@ import (
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	lgbl "util/eventlog/loggables"
 
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
-	context "golang.org/x/net/context"
 )
 
 // Diagram of dial sync:
diff --git a/swarm_listen.go b/swarm_listen.go
index ee8ee9136698587f5927ad674166e92b189a50a7..8355815869b76958acfc5376c0733fcfdd370e57 100644
--- a/swarm_listen.go
+++ b/swarm_listen.go
@@ -9,9 +9,9 @@ import (
 	transport "github.com/ipfs/go-libp2p/p2p/net/transport"
 	lgbl "util/eventlog/loggables"
 
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
 	ps "github.com/jbenet/go-peerstream"
-	context "golang.org/x/net/context"
 )
 
 // Open listeners and reuse-dialers for the given addresses
diff --git a/swarm_net.go b/swarm_net.go
index 972afc1d02f1622f5260165127f79d2fe82be74b..36416fa394f2a0b743bfc801e6955671bb019e82 100644
--- a/swarm_net.go
+++ b/swarm_net.go
@@ -8,9 +8,9 @@ import (
 	metrics "github.com/ipfs/go-libp2p/p2p/metrics"
 	inet "github.com/ipfs/go-libp2p/p2p/net"
 
+	"QmSir6qPL1tjuxd8LkR8VZq6v625ExAUVs2eCLeqQuaPGU/goprocess"
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
-	"github.com/jbenet/goprocess"
-	context "golang.org/x/net/context"
 )
 
 // Network implements the inet.Network interface.
diff --git a/swarm_net_test.go b/swarm_net_test.go
index 647c53c74e621026e43b19d02c9fe492ab9450b3..2db22fbb35595e31f17a77d3ce8d1ec60df8ce4b 100644
--- a/swarm_net_test.go
+++ b/swarm_net_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	context "golang.org/x/net/context"
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	inet "github.com/ipfs/go-libp2p/p2p/net"
 	testutil "github.com/ipfs/go-libp2p/p2p/test/util"
 )
diff --git a/swarm_notif_test.go b/swarm_notif_test.go
index 2ba852d18802c30b405fb5a4d2ea9bae0ab07484..1180d641ffcef54491255ad882034f2a0bc9e393 100644
--- a/swarm_notif_test.go
+++ b/swarm_notif_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
-	context "golang.org/x/net/context"
 
 	inet "github.com/ipfs/go-libp2p/p2p/net"
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
diff --git a/swarm_test.go b/swarm_test.go
index f9ba35ed040ecd4e5288d604a695cbc95d4d7e25..27331ade5735136d8e2192a8862ccbae868038e4 100644
--- a/swarm_test.go
+++ b/swarm_test.go
@@ -14,8 +14,8 @@ import (
 	peer "github.com/ipfs/go-libp2p/p2p/peer"
 	testutil "util/testutil"
 
+	context "QmacZi9WygGK7Me8mH53pypyscHzU386aUZXpr28GZgUct/context"
 	ma "QmbWxL1aXQhBjc1XGjGF1f2KGBMCBYSuT2ThA8YXnXJK83/go-multiaddr"
-	context "golang.org/x/net/context"
 )
 
 func EchoStreamHandler(stream inet.Stream) {