diff --git a/package.json b/package.json
index 913f9ee4d35..a6b3246edf2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.36.0",
-  "distro": "db4df4adc35cd7ca4fd140eecb2c9a5b74c73781",
+  "distro": "57a01bff16cd179e088fbd31d759765c4f62f080",
   "author": {
     "name": "Microsoft Corporation"
   },
diff --git a/src/vs/code/browser/workbench/workbench.html b/src/vs/code/browser/workbench/workbench.html
index ef812e5f344..1d443c01e62 100644
--- a/src/vs/code/browser/workbench/workbench.html
+++ b/src/vs/code/browser/workbench/workbench.html
@@ -13,11 +13,10 @@
 	<!-- Startup via workbench.js -->
 	<script>
 		self.CONNECTION_AUTH_TOKEN = '{{CONNECTION_AUTH_TOKEN}}';
-		self.SERVER_APP_ROOT = '{{SERVER_APP_ROOT}}';
 		self.WINDOW_CONFIGURATION = {
-			folderPath: '{{FOLDER}}',
-			workspacePath: '{{WORKSPACE}}',
-			userDataPath: '{{USER_DATA}}'
+			folderUri: '{{FOLDER}}',
+			workspaceUri: '{{WORKSPACE}}',
+			userDataUri: '{{USER_DATA}}'
 		}
 	</script>
 
diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts
index bcc32718f39..0732bd22a90 100644
--- a/src/vs/workbench/browser/web.main.ts
+++ b/src/vs/workbench/browser/web.main.ts
@@ -36,8 +36,9 @@ import { hash } from 'vs/base/common/hash';
 import { joinPath } from 'vs/base/common/resources';
 
 interface IWindowConfiguration {
-	userDataUri: URI;
 	remoteAuthority: string;
+
+	userDataUri: URI;
 	folderUri?: URI;
 	workspaceUri?: URI;
 }
@@ -184,18 +185,16 @@ class CodeRendererMain extends Disposable {
 }
 
 export interface IWindowConfigurationContents {
-	userDataPath: string;
-	settingsPath: string;
-	keybindingsPath: string;
-	folderPath?: string;
-	workspacePath?: string;
+	userDataUri: string;
+	folderUri?: string;
+	workspaceUri?: string;
 }
 
 export function main(windowConfigurationContents: IWindowConfigurationContents): Promise<void> {
 	const windowConfiguration: IWindowConfiguration = {
-		userDataUri: toResource(windowConfigurationContents.userDataPath),
-		folderUri: windowConfigurationContents.folderPath ? toResource(windowConfigurationContents.folderPath) : undefined,
-		workspaceUri: windowConfigurationContents.workspacePath ? toResource(windowConfigurationContents.workspacePath) : undefined,
+		userDataUri: toResource(windowConfigurationContents.userDataUri),
+		folderUri: windowConfigurationContents.folderUri ? toResource(windowConfigurationContents.folderUri) : undefined,
+		workspaceUri: windowConfigurationContents.workspaceUri ? toResource(windowConfigurationContents.workspaceUri) : undefined,
 		remoteAuthority: document.location.host
 	};
 
@@ -203,10 +202,9 @@ export function main(windowConfigurationContents: IWindowConfigurationContents):
 	return renderer.open();
 }
 
-function toResource(path: string): URI {
-	return URI.from({
+function toResource(uri: string): URI {
+	return URI.parse(uri).with({
 		scheme: Schemas.vscodeRemote,
-		authority: document.location.host,
-		path
+		authority: document.location.host
 	});
 }