diff --git a/build/fillers/monaco-editor-core-amd.ts b/build/fillers/monaco-editor-core-amd.ts
deleted file mode 100644
index 94c0b54e..00000000
--- a/build/fillers/monaco-editor-core-amd.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-// Resolves with the global monaco API
-
-export = (<any>self).monaco;
diff --git a/build/utils.js b/build/utils.js
index 6700fd09..3c1a9e50 100644
--- a/build/utils.js
+++ b/build/utils.js
@@ -181,9 +181,10 @@ function buildOneAMD(type, options) {
 		plugins: [
 			alias({
 				'vscode-nls': path.join(__dirname, '../build/fillers/vscode-nls.ts'),
-				'monaco-editor-core': path.join(__dirname, '../build/fillers/monaco-editor-core-amd.ts')
+				'monaco-editor-core': path.join(__dirname, '../src/fillers/monaco-editor-core-amd.ts')
 			})
-		]
+		],
+		external: ['vs/editor/editor.api']
 	};
 	if (type === 'min') {
 		opts.minify = true;
diff --git a/src/fillers/editor.api.d.ts b/src/fillers/editor.api.d.ts
new file mode 100644
index 00000000..9404b2fc
--- /dev/null
+++ b/src/fillers/editor.api.d.ts
@@ -0,0 +1,4 @@
+declare module 'vs/editor/editor.api' {
+	const x: any;
+	export = x;
+}
diff --git a/src/fillers/monaco-editor-core-amd.ts b/src/fillers/monaco-editor-core-amd.ts
index 0e8a7e3f..3580fa0f 100644
--- a/src/fillers/monaco-editor-core-amd.ts
+++ b/src/fillers/monaco-editor-core-amd.ts
@@ -5,8 +5,7 @@
 
 // Resolves with the global monaco API
 
-declare var define: any;
+/// <reference path="./editor.api.d.ts" />
+import * as api from 'vs/editor/editor.api';
 
-define([], function () {
-	return (<any>self).monaco;
-});
+export = api;