diff --git a/configs/client-default.js b/configs/client-default.js
index 8a6c8c25..f83b1026 100644
--- a/configs/client-default.js
+++ b/configs/client-default.js
@@ -320,7 +320,7 @@ module.exports = function(options) {
         "plugins/c9.ide.language.generic/generic",
         "plugins/c9.ide.language.css/css",
         "plugins/c9.ide.language.html/html",
-        "plugins/c9.ide.language.codeintel/codeintel",
+        // "plugins/c9.ide.language.codeintel/codeintel",
         "plugins/c9.ide.language.javascript/javascript",
         "plugins/c9.ide.language.javascript.immediate/immediate",
         "plugins/c9.ide.language.javascript.infer/jsinfer",
diff --git a/package.json b/package.json
index 98eb89e9..05f4d166 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,6 @@
         "emmet": "git://github.com/cloud9ide/emmet-core.git#2ff6dc06ad",
         "engine.io": "1.5.3",
         "engine.io-client": "1.5.3",
-        "eslint": "git://github.com/cloud9ide/eslint.git#dc500e81162bf0cb4747a4a415c121b0c46975cb",
         "jsonm": "1.0.6",
         "http-error": "~0.0.5",
         "less": "^2.4.0",