diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 000000000..499b34048
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1 @@
+test/test-folder/ipfs-add.js
\ No newline at end of file
diff --git a/package.json b/package.json
index 189a95fe8..e31c8dc76 100644
--- a/package.json
+++ b/package.json
@@ -24,11 +24,11 @@
   },
   "devDependencies": {
     "babel-core": "^6.1.21",
-    "babel-eslint": "^4.1.6",
+    "babel-eslint": "^5.0.0-beta6",
     "babel-loader": "^6.2.0",
     "babel-plugin-transform-runtime": "^6.1.18",
     "babel-preset-es2015": "^6.0.15",
-    "babel-runtime": "^5.8.34",
+    "babel-runtime": "^6.3.19",
     "chai": "^3.4.1",
     "concurrently": "^1.0.0",
     "eslint-config-standard": "^4.4.0",
@@ -45,7 +45,7 @@
     "gulp-tag-version": "^1.3.0",
     "gulp-util": "^3.0.7",
     "https-browserify": "0.0.1",
-    "ipfsd-ctl": "^0.7.1",
+    "ipfsd-ctl": "^0.8.0",
     "json-loader": "^0.5.3",
     "karma": "^0.13.11",
     "karma-chrome-launcher": "^0.2.1",
diff --git a/tasks/daemons.js b/tasks/daemons.js
index a688c6ab0..6bebbfd35 100644
--- a/tasks/daemons.js
+++ b/tasks/daemons.js
@@ -59,10 +59,7 @@ function startDisposableDaemons (callback) {
 
           const headers = {
             HTTPHeaders: {
-              'Access-Control-Allow-Origin': ['*'],
-              // TODO: When ipfs/go-ipfs#1979 is merged drop these
-              'Access-Control-Allow-Headers': ['X-Stream-Output, X-Chunked-Output'],
-              'Access-Control-Expose-Headers': ['X-Stream-Output, X-Chunked-Output']
+              'Access-Control-Allow-Origin': ['*']
             }
           }
           ipfsNodes[key].setConfig('API', JSON.stringify(headers), err => {