diff --git a/src/vs/code/browser/workbench/workbench.ts b/src/vs/code/browser/workbench/workbench.ts
index cd6cde15786fc8106184b1e3c1d1cdee0cbcd76b..0ef8b9dc81419b53b27cf111fb206d72ba56bada 100644
--- a/src/vs/code/browser/workbench/workbench.ts
+++ b/src/vs/code/browser/workbench/workbench.ts
@@ -17,7 +17,6 @@ import { isStandalone } from 'vs/base/browser/browser';
 import { localize } from 'vs/nls';
 import { Schemas } from 'vs/base/common/network';
 import product from 'vs/platform/product/common/product';
-import { getLogLevel, LogLevel } from 'vs/platform/log/common/log';
 
 function doCreateUri(path: string, queryValues: Map<string, string>): URI {
 	let query: string | undefined = undefined;
@@ -417,8 +416,7 @@ class WindowIndicator implements IWindowIndicator {
 	// Find workspace to open and payload
 	let foundWorkspace = false;
 	let workspace: IWorkspace;
-	let payloadRaw = Object.create(null);
-	let payloadMap = new Map<string, string>();
+	let payload = Object.create(null);
 
 	const query = new URL(document.location.href).searchParams;
 	query.forEach((value, key) => {
@@ -445,10 +443,7 @@ class WindowIndicator implements IWindowIndicator {
 			// Payload
 			case WorkspaceProvider.QUERY_PARAM_PAYLOAD:
 				try {
-					payloadRaw = JSON.parse(value);
-					if (Array.isArray(payloadRaw)) {
-						payloadMap = new Map(payloadRaw);
-					}
+					payload = JSON.parse(value);
 				} catch (error) {
 					console.error(error); // possible invalid JSON
 				}
@@ -468,7 +463,7 @@ class WindowIndicator implements IWindowIndicator {
 	}
 
 	// Workspace Provider
-	const workspaceProvider = new WorkspaceProvider(workspace, payloadRaw);
+	const workspaceProvider = new WorkspaceProvider(workspace, payload);
 
 	// Home Indicator
 	const homeIndicator: IHomeIndicator = {
@@ -516,13 +511,6 @@ class WindowIndicator implements IWindowIndicator {
 		}
 	} : undefined;
 
-	// log level
-	let logLevel: LogLevel | undefined = undefined;
-	const logLevelPayload = payloadMap.get('logLevel');
-	if (logLevelPayload) {
-		logLevel = getLogLevel(logLevelPayload);
-	}
-
 	// Finally create workbench
 	create(document.body, {
 		...config,
@@ -532,7 +520,6 @@ class WindowIndicator implements IWindowIndicator {
 		productQualityChangeHandler,
 		workspaceProvider,
 		urlCallbackProvider: new PollingURLCallbackProvider(),
-		credentialsProvider: new LocalStorageCredentialsProvider(),
-		logLevel
+		credentialsProvider: new LocalStorageCredentialsProvider()
 	});
 })();
diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts
index 86084eef8daa9d98f992dea0864b7f8f02768bb9..40d7586b33fb05a4999d3adbf8f2fd113d827041 100644
--- a/src/vs/workbench/browser/web.main.ts
+++ b/src/vs/workbench/browser/web.main.ts
@@ -6,7 +6,7 @@
 import { mark } from 'vs/base/common/performance';
 import { domContentLoaded, addDisposableListener, EventType, EventHelper, detectFullscreen, addDisposableThrottledListener } from 'vs/base/browser/dom';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { ILogService, ConsoleLogService, MultiplexLogService } from 'vs/platform/log/common/log';
+import { ILogService, ConsoleLogService, MultiplexLogService, getLogLevel } from 'vs/platform/log/common/log';
 import { ConsoleLogInAutomationService } from 'vs/platform/log/browser/log';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { BrowserWorkbenchEnvironmentService } from 'vs/workbench/services/environment/browser/environmentService';
@@ -152,11 +152,6 @@ class BrowserMain extends Disposable {
 		// CONTRIBUTE IT VIA WORKBENCH.WEB.MAIN.TS AND registerSingleton().
 		// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-		// Log
-		const logsPath = URI.file(toLocalISOString(new Date()).replace(/-|:|\.\d+Z$/g, '')).with({ scheme: 'vscode-log' });
-		const logService = new BufferLogService(this.configuration.logLevel);
-		serviceCollection.set(ILogService, logService);
-
 		// Resource Identity
 		const resourceIdentityService = this._register(new WebResourceIdentityService());
 		serviceCollection.set(IResourceIdentityService, resourceIdentityService);
@@ -168,9 +163,14 @@ class BrowserMain extends Disposable {
 		serviceCollection.set(IProductService, productService);
 
 		// Environment
+		const logsPath = URI.file(toLocalISOString(new Date()).replace(/-|:|\.\d+Z$/g, '')).with({ scheme: 'vscode-log' });
 		const environmentService = new BrowserWorkbenchEnvironmentService({ workspaceId: payload.id, logsPath, ...this.configuration }, productService);
 		serviceCollection.set(IWorkbenchEnvironmentService, environmentService);
 
+		// Log
+		const logService = new BufferLogService(getLogLevel(environmentService));
+		serviceCollection.set(ILogService, logService);
+
 		// Remote
 		const remoteAuthorityResolverService = new RemoteAuthorityResolverService(this.configuration.resourceUriProvider);
 		serviceCollection.set(IRemoteAuthorityResolverService, remoteAuthorityResolverService);
diff --git a/src/vs/workbench/workbench.web.api.ts b/src/vs/workbench/workbench.web.api.ts
index 066eaa6bac07945fafe93cd106820188f2628fca..1cc7f1c4e81820343f6f71bc383db2379003338f 100644
--- a/src/vs/workbench/workbench.web.api.ts
+++ b/src/vs/workbench/workbench.web.api.ts
@@ -153,7 +153,6 @@ enum ColorScheme {
 	HIGH_CONTRAST = 'hc'
 }
 
-
 interface IInitialColorTheme {
 
 	/**