diff --git a/src/vs/languages/buildfile-editor-languages.js b/src/vs/languages/buildfile-editor-languages.js
index a04b7b55f218b7cdd6150c90694e0893bfc839bb..7ebc0796fd5cfb4f0732c2ae9611c180ffe96a3a 100644
--- a/src/vs/languages/buildfile-editor-languages.js
+++ b/src/vs/languages/buildfile-editor-languages.js
@@ -51,10 +51,12 @@ exports.collectModules = function(args) {
 	// ---- typescript -----------------------------------
 	common.define('vs/languages/typescript/common/typescriptMode', SHARED_JS_TS)
 		.combine(worker)
-			.define('vs/languages/typescript/common/worker/workerImpl');
+			.define('vs/languages/typescript/common/worker/workerImpl', SHARED_JS_TS);
 
 	// ---- javascript ----------------------------
 	common.define('vs/languages/javascript/common/javascript', SHARED_JS_TS.concat(['vs/languages/typescript/common/typescriptMode']));
 
+	common.define('vs/languages/typescript/common/worker/workerManager', SHARED_JS_TS);
+
 	return result;
 };
\ No newline at end of file
diff --git a/src/vs/languages/typescript/common/typescriptMode.ts b/src/vs/languages/typescript/common/typescriptMode.ts
index 284170f0cff1543838e19a1e743db44866531755..478ebf61e79ba8b194de36061851f4707b9bec7d 100644
--- a/src/vs/languages/typescript/common/typescriptMode.ts
+++ b/src/vs/languages/typescript/common/typescriptMode.ts
@@ -29,6 +29,8 @@ export class TypeScriptMode extends AbstractMode implements lifecycle.IDisposabl
 		super(descriptor.id);
 
 		if (threadService.isInMainThread) {
+			// this is needed as long as this mode is also instantiated in the
+			// worker
 			require(['vs/languages/typescript/common/worker/workerManager'], manager => {
 				this._disposables.push(manager.create(this.getId(), this._modelService, this._markerService));
 			}, err => {