From c4f25e7f811a8414c7964fa41950b88b4799b738 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Thu, 18 Aug 2016 14:52:48 +0000
Subject: [PATCH 1/2] Disable multi-port logic to make V3 work with the new VPN

---
 package.json                         |  1 -
 plugins/c9.static/unpacked_helper.js | 39 ----------------------------
 2 files changed, 40 deletions(-)
 delete mode 100644 plugins/c9.static/unpacked_helper.js

diff --git a/package.json b/package.json
index 850fa3c2..20aaceee 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,6 @@
         "less": "^2.4.0",
         "mime": "~1.2.9",
         "mkdirp": "~0.3.5",
-        "msgpack-js": "~0.1.1",
         "msgpack-js-browser": "~0.1.4",
         "nak": "https://github.com/cloud9ide/nak.git#6deef931594",
         "netutil": "~0.0.2",
diff --git a/plugins/c9.static/unpacked_helper.js b/plugins/c9.static/unpacked_helper.js
deleted file mode 100644
index c5bb48ef..00000000
--- a/plugins/c9.static/unpacked_helper.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * unpacked_helper speeds up the unpacked version of Cloud9
- * by using more parallel connections and avoiding
- * subsubdomains on dogfooding (e.g., ide.dev-lennartcl.c9.io, where
- * Chrome doesn't support any caching).
- */
-"use strict";
-
-plugin.consumes = [
-    "db", "connect.static"
-];
-plugin.provides = [
-    "unpacked_helper"
-];
-
-module.exports = plugin;
-
-function plugin(options, imports, register) {
-    var connectStatic = imports["connect.static"];
-    var assert = require("assert");
-    var baseUrl = options.baseUrl;
-    var ideBaseUrl = options.ideBaseUrl;
-    assert(baseUrl, "baseUrl must be set");
-    assert(ideBaseUrl, "ideBaseUrl must be set");
-    
-    var balancers = [
-        baseUrl + "/_unp",
-        baseUrl + ":8080/_unp",
-        baseUrl + ":8081/_unp",
-        baseUrl + ":8082/_unp",
-    ];
-    
-    connectStatic.getRequireJsConfig().baseUrlLoadBalancers = balancers;
-    assert(connectStatic.getRequireJsConfig().baseUrlLoadBalancers);
-    
-    register(null, {
-        "unpacked_helper": {}
-    });
-}
\ No newline at end of file

From d07eeb1b189de5736d19ace8b949f29ec954fb77 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Mon, 12 Sep 2016 10:01:04 +0000
Subject: [PATCH 2/2] Revert "Remove obsolete onlinedev_helper.js"

This reverts commit 6b858b7b95effd9b3ddf3f046e39ca9db0e3f0ae.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 20aaceee..92942041 100644
--- a/package.json
+++ b/package.json
@@ -119,7 +119,7 @@
         "c9.ide.threewaymerge": "#229382aa0b",
         "c9.ide.undo": "#b028bcb4d5",
         "c9.ide.upload": "#e4351f5a2b",
-        "c9.ide.welcome": "#5b86c44e92",
+        "c9.ide.welcome": "#7b75aefc28",
         "c9.ide.guide": "#19f6087429"
     }
 }
\ No newline at end of file