diff --git a/src/vs/editor/common/worker/editorWorkerServer.ts b/src/vs/editor/common/worker/editorWorkerServer.ts
index 161efa11ea096f9e9880e34058fe18151de0d552..fb74566b8a098101e5008d678dd3f5db95d609e2 100644
--- a/src/vs/editor/common/worker/editorWorkerServer.ts
+++ b/src/vs/editor/common/worker/editorWorkerServer.ts
@@ -19,7 +19,6 @@ import {ResourceService} from 'vs/editor/common/services/resourceServiceImpl';
 import {BaseWorkspaceContextService} from 'vs/platform/workspace/common/baseWorkspaceContextService';
 import {ModelServiceWorkerHelper} from 'vs/editor/common/services/modelServiceImpl';
 import {IPluginDescription} from 'vs/platform/plugins/common/plugins';
-import {PromiseSource} from 'vs/base/common/async';
 import {BaseRequestService} from 'vs/platform/request/common/baseRequestService';
 import {IWorkspace} from 'vs/platform/workspace/common/workspace';
 import {AbstractPluginService, ActivatedPlugin} from 'vs/platform/plugins/common/abstractPluginService';
@@ -106,8 +105,6 @@ export class EditorWorkerServer {
 
 		var modeService = new ModeServiceImpl(this.threadService, pluginService);
 
-		var modesRegistryPromise = new PromiseSource();
-
 		var requestService = new BaseRequestService(contextService, telemetryServiceInstance);
 
 		var _services : any = {
@@ -122,22 +119,14 @@ export class EditorWorkerServer {
 			requestService: requestService
 		};
 
-		var servicePromise = TPromise.as(null);
-
-		servicePromise.then((_) => {
-
-			var instantiationService = InstantiationService.create(_services);
-			this.threadService.setInstantiationService(instantiationService);
-
-			// Instantiate thread actors
-			this.threadService.getRemotable(ModeServiceWorkerHelper);
-			this.threadService.getRemotable(ModelServiceWorkerHelper);
+		var instantiationService = InstantiationService.create(_services);
+		this.threadService.setInstantiationService(instantiationService);
 
-			// Set to modes registry (ensure the synchronized object is constructed)
-			modesRegistryPromise.complete();
+		// Instantiate thread actors
+		this.threadService.getRemotable(ModeServiceWorkerHelper);
+		this.threadService.getRemotable(ModelServiceWorkerHelper);
 
-			complete(undefined);
-		});
+		complete(undefined);
 	}
 
 	public request(mainThread:WorkerServer, complete:ICallback, error:ICallback, progress:ICallback, data:any):void {