diff --git a/blocks/blockstore/blockstore.go b/blocks/blockstore/blockstore.go
index 96b5c9407..905fcf029 100644
--- a/blocks/blockstore/blockstore.go
+++ b/blocks/blockstore/blockstore.go
@@ -193,8 +193,6 @@ func (bs *blockstore) AllKeysChan(ctx context.Context) (<-chan *cid.Cid, error)
 
 	// KeysOnly, because that would be _a lot_ of data.
 	q := dsq.Query{KeysOnly: true}
-	// datastore/namespace does *NOT* fix up Query.Prefix
-	q.Prefix = BlockPrefix.String()
 	res, err := bs.datastore.Query(q)
 	if err != nil {
 		return nil, err
diff --git a/circle.yml b/circle.yml
index ccc888b06..5a6290c15 100644
--- a/circle.yml
+++ b/circle.yml
@@ -12,8 +12,8 @@ machine:
 
   post:
     - sudo rm -rf /usr/local/go
-    - if [ ! -e go1.7.linux-amd64.tar.gz ]; then curl -o go1.7.linux-amd64.tar.gz https://storage.googleapis.com/golang/go1.7.linux-amd64.tar.gz; fi
-    - sudo tar -C /usr/local -xzf go1.7.linux-amd64.tar.gz
+    - if [ ! -e go1.8.3.linux-amd64.tar.gz ]; then curl -o go1.8.3.linux-amd64.tar.gz https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz; fi
+    - sudo tar -C /usr/local -xzf go1.8.3.linux-amd64.tar.gz
 
   services:
     - docker
@@ -30,7 +30,7 @@ dependencies:
     - cd "$HOME/.go_workspace/src/$IMPORT_PATH" && make deps
 
   cache_directories:
-    - ~/go1.7.linux-amd64.tar.gz
+    - ~/go1.8.3.linux-amd64.tar.gz
     - "$HOME/.go_workspace/src/gx/ipfs"
 
 test:
diff --git a/filestore/fsrefstore.go b/filestore/fsrefstore.go
index 58d18aed9..63978fbfd 100644
--- a/filestore/fsrefstore.go
+++ b/filestore/fsrefstore.go
@@ -59,7 +59,6 @@ func NewFileManager(ds ds.Batching, root string) *FileManager {
 // closed.
 func (f *FileManager) AllKeysChan(ctx context.Context) (<-chan *cid.Cid, error) {
 	q := dsq.Query{KeysOnly: true}
-	q.Prefix = FilestorePrefix.String()
 
 	res, err := f.ds.Query(q)
 	if err != nil {
diff --git a/package.json b/package.json
index c951ae97e..0cafe5da6 100644
--- a/package.json
+++ b/package.json
@@ -366,11 +366,6 @@
       "name": "go-multiaddr-net",
       "version": "1.5.4"
     },
-    {
-      "hash": "QmP1wMAqk6aZYRZirbaAwmrNeqFRgQrwBt3orUtvSa1UYD",
-      "name": "go-libp2p-routing",
-      "version": "2.2.16"
-    },
     {
       "author": "libp2p",
       "hash": "QmPsBptED6X43GYg3347TAUruN3UfsAhaGTP9xbinYX7uf",
@@ -441,11 +436,6 @@
       "hash": "QmXxGS5QsUxpR3iqL5DjmsYPHR1Yz74siRQ4ChJqWFosMh",
       "name": "go-block-format",
       "version": "0.1.2"
-    },
-    {
-      "hash": "QmP1wMAqk6aZYRZirbaAwmrNeqFRgQrwBt3orUtvSa1UYD",
-      "name": "go-libp2p-routing",
-      "version": "2.2.16"
     }
   ],
   "gxVersion": "0.10.0",