diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
index ed80eb31cac561de5d87d07f662859f0cac675fb..d8cb1b5b3a528992fd497bc9603230033fa1ea9a 100644
--- a/src/vs/vscode.proposed.d.ts
+++ b/src/vs/vscode.proposed.d.ts
@@ -11,7 +11,7 @@ declare module 'vscode' {
 		export function sampleFunction(): Thenable<any>;
 	}
 
-	//#region Joh: file system provider
+	//#region Joh: file system provider (OLD)
 
 	export enum FileChangeType {
 		Updated = 0,
@@ -84,8 +84,22 @@ declare module 'vscode' {
 		// create(resource: Uri): Thenable<FileStat>;
 	}
 
+	export type DeprecatedFileChangeType = FileChangeType;
+	export type DeprecatedFileType = FileType;
+	export type DeprecatedFileChange = FileChange;
+	export type DeprecatedFileStat = FileStat;
+	export type DeprecatedFileSystemProvider = FileSystemProvider;
+
+	export namespace workspace {
+		export function registerDeprecatedFileSystemProvider(scheme: string, provider: DeprecatedFileSystemProvider): Disposable;
+	}
+
+	//#endregion
+
+	//#region Joh: file system provider (new)
+
 	/**
-	 * 
+	 *
 	 */
 	export class FileError extends Error {
 
@@ -194,8 +208,8 @@ declare module 'vscode' {
 		writeFile(uri: Uri, content: Uint8Array, options: { flags: FileOpenFlags }, token: CancellationToken): void | Thenable<void>;
 
 		/**
-		 * Delete a file or folder from the underlying storage. 
-		 * 
+		 * Delete a file or folder from the underlying storage.
+		 *
 		 * @param uri The resource that is to be deleted
 		 * @param options Options bag for future use
 		 * @param token A cancellation token.
@@ -224,7 +238,6 @@ declare module 'vscode' {
 
 	export namespace workspace {
 		export function registerFileSystemProvider(scheme: string, provider: FileSystemProvider, newProvider?: FileSystemProvider2): Disposable;
-		export function registerDeprecatedFileSystemProvider(scheme: string, provider: FileSystemProvider): Disposable;
 	}
 
 	//#endregion
diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts
index d368888e620bb42691215b101c3db2b4e52ae6d2..4c5cce2c9dbada928c81e84565bdfb2128ec9b76 100644
--- a/src/vs/workbench/api/node/extHost.api.impl.ts
+++ b/src/vs/workbench/api/node/extHost.api.impl.ts
@@ -687,6 +687,8 @@ export function createApiFactory(
 
 			FileChangeType: extHostTypes.FileChangeType,
 			FileType: extHostTypes.FileType,
+			DeprecatedFileChangeType: extHostTypes.FileChangeType,
+			DeprecatedFileType: extHostTypes.FileType,
 			FileChangeType2: extHostTypes.FileChangeType2,
 			FileType2: extHostTypes.FileType2,
 			FileOpenFlags: files.FileOpenFlags,
diff --git a/src/vs/workbench/api/node/extHostFileSystem.ts b/src/vs/workbench/api/node/extHostFileSystem.ts
index ade7b9781101602026d127677fb4a12fea49ac9f..18b53fc96875e551db79ceade38e2a534b2d98de 100644
--- a/src/vs/workbench/api/node/extHostFileSystem.ts
+++ b/src/vs/workbench/api/node/extHostFileSystem.ts
@@ -63,7 +63,7 @@ class FileSystemProviderShim implements vscode.FileSystemProvider2 {
 
 	onDidChangeFile: vscode.Event<vscode.FileChange2[]>;
 
-	constructor(private readonly _delegate: vscode.FileSystemProvider) {
+	constructor(private readonly _delegate: vscode.DeprecatedFileSystemProvider) {
 		if (!this._delegate.onDidChange) {
 			this.onDidChangeFile = Event.None;
 		} else {
@@ -89,7 +89,7 @@ class FileSystemProviderShim implements vscode.FileSystemProvider2 {
 		});
 	}
 
-	private static _modernizeFileStat(stat: vscode.FileStat): vscode.FileStat2 {
+	private static _modernizeFileStat(stat: vscode.DeprecatedFileStat): vscode.FileStat2 {
 		let { mtime, size, type } = stat;
 		let newType: vscode.FileType2;
 
@@ -108,7 +108,7 @@ class FileSystemProviderShim implements vscode.FileSystemProvider2 {
 		return { mtime, size, type: newType };
 	}
 
-	private static _modernizeFileChange(e: vscode.FileChange): vscode.FileChange2 {
+	private static _modernizeFileChange(e: vscode.DeprecatedFileChange): vscode.FileChange2 {
 		let { resource, type } = e;
 		let newType: vscode.FileChangeType2;
 		switch (type) {
@@ -184,11 +184,11 @@ export class ExtHostFileSystem implements ExtHostFileSystemShape {
 		extHostLanguageFeatures.registerDocumentLinkProvider('*', this._linkProvider);
 	}
 
-	registerDeprecatedFileSystemProvider(scheme: string, provider: vscode.FileSystemProvider) {
+	registerDeprecatedFileSystemProvider(scheme: string, provider: vscode.DeprecatedFileSystemProvider) {
 		return this._doRegisterFileSystemProvider(scheme, new FileSystemProviderShim(provider));
 	}
 
-	registerFileSystemProvider(scheme: string, provider: vscode.FileSystemProvider, newProvider: vscode.FileSystemProvider2) {
+	registerFileSystemProvider(scheme: string, provider: vscode.DeprecatedFileSystemProvider, newProvider: vscode.FileSystemProvider2) {
 		if (newProvider && newProvider._version === 8) {
 			return this._doRegisterFileSystemProvider(scheme, newProvider);
 		} else if (provider) {