diff --git a/extensions/typescript/package.json b/extensions/typescript/package.json
index f7d1fb0d940..ba354fcb40c 100644
--- a/extensions/typescript/package.json
+++ b/extensions/typescript/package.json
@@ -13,6 +13,8 @@
 		"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../gulpfile.plugins.js compile-plugin:typescript ./src/tsconfig.json"
 	},
 	"activationEvents": [
+		"onLanguage:javascript",
+		"onLanguage:javascriptreact",
 		"onLanguage:typescript",
 		"onLanguage:typescriptreact",
 		"onCommand:typescript.reloadProjects"
diff --git a/extensions/typescript/src/typescriptMain.ts b/extensions/typescript/src/typescriptMain.ts
index d0395d10b56..a6b81cbc421 100644
--- a/extensions/typescript/src/typescriptMain.ts
+++ b/extensions/typescript/src/typescriptMain.ts
@@ -51,11 +51,8 @@ export function activate(context: ExtensionContext): void {
 	client.onReady().then(() => {
 		registerSupports(MODE_ID_TS, clientHost, client);
 		registerSupports(MODE_ID_TSX, clientHost, client);
-		let useSalsa = !!process.env['CODE_TSJS'] || !!process.env['VSCODE_TSJS'];
-		if (useSalsa) {
-			registerSupports(MODE_ID_JS, clientHost, client);
-			registerSupports(MODE_ID_JSX, clientHost, client);
-		}
+		registerSupports(MODE_ID_JS, clientHost, client);
+		registerSupports(MODE_ID_JSX, clientHost, client);
 	}, () => {
 		// Nothing to do here. The client did show a message;
 	});
diff --git a/src/vs/languages/javascript/common/javascript.contribution.ts b/src/vs/languages/javascript/common/javascript.contribution.ts
index 3dd9246e273..5835df2a0e7 100644
--- a/src/vs/languages/javascript/common/javascript.contribution.ts
+++ b/src/vs/languages/javascript/common/javascript.contribution.ts
@@ -12,7 +12,8 @@ import {LanguageExtensions} from 'vs/editor/common/modes/languageExtensionPoint'
 import Options = require('vs/languages/typescript/common/options');
 let defaults = Options.javaScriptOptions;
 
-if (!env.enableTypeScriptServiceModeForJS) {
+let enable = false;
+if (enable) {
 
 	LanguageExtensions.registerCompatMode({
 		id: 'javascript',
diff --git a/src/vs/workbench/node/extensionPoints.ts b/src/vs/workbench/node/extensionPoints.ts
index 129bf88b5ca..c636ad979b2 100644
--- a/src/vs/workbench/node/extensionPoints.ts
+++ b/src/vs/workbench/node/extensionPoints.ts
@@ -126,17 +126,6 @@ export class PluginScanner {
 				});
 				return null;
 			}
-			// This is a workaround to enable Salsa and avoid TS extension loading
-			// for JavaScript (see https://github.com/Microsoft/vscode/issues/2225)
-			if (pluginDescFromFile.name === 'typescript' && pluginDescFromFile.publisher === 'vscode' && (!!process.env['CODE_TSJS'] || !!process.env['VSCODE_TSJS'])) {
-				pluginDescFromFile.activationEvents = pluginDescFromFile.activationEvents || [];
-				if (pluginDescFromFile.activationEvents.indexOf('onLanguage:javascript') === -1) {
-					pluginDescFromFile.activationEvents.push('onLanguage:javascript');
-				}
-				if (pluginDescFromFile.activationEvents.indexOf('onLanguage:javascriptreact') === -1) {
-					pluginDescFromFile.activationEvents.push('onLanguage:javascriptreact');
-				}
-			}
 
 			let extension = paths.extname(absoluteManifestPath);
 			let basename = absoluteManifestPath.substr(0, absoluteManifestPath.length - extension.length);