diff --git a/configs/client-default.js b/configs/client-default.js
index 7756c0fc..b9a456fc 100644
--- a/configs/client-default.js
+++ b/configs/client-default.js
@@ -907,8 +907,12 @@ module.exports = function(options) {
         });
     }
     
-    if (options.platform !== "win32")
-        plugins.push("plugins/c9.ide.language.codeintel/codeintel");
+    if (options.platform !== "win32") {
+        plugins.push({
+            packagePath: "plugins/c9.ide.language.codeintel/codeintel",
+            preinstalled: hosted && !options.ssh,
+        });
+    }
 
     return plugins;
 };
diff --git a/package.json b/package.json
index 2a5e4e86..574732a0 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#f03e5ca0c8",
+        "c9.ide.language": "#fff9c75928",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#92210f5a48",
         "c9.ide.language.html": "#22fdc74869",
@@ -64,9 +64,9 @@
         "c9.ide.language.javascript.immediate": "#c8b1e5767a",
         "c9.ide.language.javascript.eslint": "#4de5457db1",
         "c9.ide.language.javascript.tern": "#b55d0069bb",
-        "c9.ide.language.javascript.infer": "#325ac6880e",
+        "c9.ide.language.javascript.infer": "#18acb93a3a",
         "c9.ide.language.jsonalyzer": "#4b329741b1",
-        "c9.ide.language.codeintel": "#046d39603b",
+        "c9.ide.language.codeintel": "#871d8e5e5d",
         "c9.ide.collab": "#11a0d3c5ce",
         "c9.ide.local": "#10eb45842a",
         "c9.ide.find": "#e33fbaed2f",