diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts
index 1a89a1bb10f6c0aeb5477a6b86391076f9bfc876..a9fe1cda9252f4a7fe05cf077d574dc79e0de8a3 100644
--- a/src/vs/platform/files/common/files.ts
+++ b/src/vs/platform/files/common/files.ts
@@ -198,21 +198,21 @@ export interface IFileSystemProvider {
 	onDidChangeFile: Event<IFileChange[]>;
 	watch(resource: URI, opts: IWatchOptions): IDisposable;
 
-	stat(resource: URI): TPromise<IStat>;
-	mkdir(resource: URI): TPromise<void>;
-	readdir(resource: URI): TPromise<[string, FileType][]>;
-	delete(resource: URI, opts: FileDeleteOptions): TPromise<void>;
+	stat(resource: URI): Thenable<IStat>;
+	mkdir(resource: URI): Thenable<void>;
+	readdir(resource: URI): Thenable<[string, FileType][]>;
+	delete(resource: URI, opts: FileDeleteOptions): Thenable<void>;
 
-	rename(from: URI, to: URI, opts: FileOverwriteOptions): TPromise<void>;
-	copy?(from: URI, to: URI, opts: FileOverwriteOptions): TPromise<void>;
+	rename(from: URI, to: URI, opts: FileOverwriteOptions): Thenable<void>;
+	copy?(from: URI, to: URI, opts: FileOverwriteOptions): Thenable<void>;
 
-	readFile?(resource: URI): TPromise<Uint8Array>;
-	writeFile?(resource: URI, content: Uint8Array, opts: FileWriteOptions): TPromise<void>;
+	readFile?(resource: URI): Thenable<Uint8Array>;
+	writeFile?(resource: URI, content: Uint8Array, opts: FileWriteOptions): Thenable<void>;
 
-	open?(resource: URI): TPromise<number>;
-	close?(fd: number): TPromise<void>;
-	read?(fd: number, pos: number, data: Uint8Array, offset: number, length: number): TPromise<number>;
-	write?(fd: number, pos: number, data: Uint8Array, offset: number, length: number): TPromise<number>;
+	open?(resource: URI): Thenable<number>;
+	close?(fd: number): Thenable<void>;
+	read?(fd: number, pos: number, data: Uint8Array, offset: number, length: number): Thenable<number>;
+	write?(fd: number, pos: number, data: Uint8Array, offset: number, length: number): Thenable<number>;
 }
 
 export interface IFileSystemProviderRegistrationEvent {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts
index 60985bd29020212144767c4213c2e61cb57d471d..911c23e45899171219ccd5d68ce1c3900122947f 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts
@@ -7,7 +7,6 @@
 import { Emitter, Event } from 'vs/base/common/event';
 import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { FileWriteOptions, FileSystemProviderCapabilities, IFileChange, IFileService, IFileSystemProvider, IStat, IWatchOptions, FileType, FileOverwriteOptions, FileDeleteOptions } from 'vs/platform/files/common/files';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 import { ExtHostContext, ExtHostFileSystemShape, IExtHostContext, IFileChangeDto, MainContext, MainThreadFileSystemShape } from '../node/extHost.protocol';
@@ -96,53 +95,53 @@ class RemoteFileSystemProvider implements IFileSystemProvider {
 		return Buffer.isBuffer(data) ? data : Buffer.from(data.buffer, data.byteOffset, data.byteLength);
 	}
 
-	stat(resource: URI): TPromise<IStat> {
+	stat(resource: URI): Thenable<IStat> {
 		return this._proxy.$stat(this._handle, resource).then(undefined, err => {
 			throw err;
 		});
 	}
 
-	readFile(resource: URI): TPromise<Uint8Array> {
+	readFile(resource: URI): Thenable<Uint8Array> {
 		return this._proxy.$readFile(this._handle, resource);
 	}
 
-	writeFile(resource: URI, content: Uint8Array, opts: FileWriteOptions): TPromise<void> {
+	writeFile(resource: URI, content: Uint8Array, opts: FileWriteOptions): Thenable<void> {
 		return this._proxy.$writeFile(this._handle, resource, RemoteFileSystemProvider._asBuffer(content), opts);
 	}
 
-	delete(resource: URI, opts: FileDeleteOptions): TPromise<void> {
+	delete(resource: URI, opts: FileDeleteOptions): Thenable<void> {
 		return this._proxy.$delete(this._handle, resource, opts);
 	}
 
-	mkdir(resource: URI): TPromise<void> {
+	mkdir(resource: URI): Thenable<void> {
 		return this._proxy.$mkdir(this._handle, resource);
 	}
 
-	readdir(resource: URI): TPromise<[string, FileType][]> {
+	readdir(resource: URI): Thenable<[string, FileType][]> {
 		return this._proxy.$readdir(this._handle, resource);
 	}
 
-	rename(resource: URI, target: URI, opts: FileOverwriteOptions): TPromise<void> {
+	rename(resource: URI, target: URI, opts: FileOverwriteOptions): Thenable<void> {
 		return this._proxy.$rename(this._handle, resource, target, opts);
 	}
 
-	copy(resource: URI, target: URI, opts: FileOverwriteOptions): TPromise<void> {
+	copy(resource: URI, target: URI, opts: FileOverwriteOptions): Thenable<void> {
 		return this._proxy.$copy(this._handle, resource, target, opts);
 	}
 
-	open(resource: URI): TPromise<number> {
+	open(resource: URI): Thenable<number> {
 		return this._proxy.$open(this._handle, resource);
 	}
 
-	close(fd: number): TPromise<void> {
+	close(fd: number): Thenable<void> {
 		return this._proxy.$close(this._handle, fd);
 	}
 
-	read(fd: number, pos: number, data: Uint8Array, offset: number, length: number): TPromise<number> {
+	read(fd: number, pos: number, data: Uint8Array, offset: number, length: number): Thenable<number> {
 		return this._proxy.$read(this._handle, fd, pos, RemoteFileSystemProvider._asBuffer(data), offset, length);
 	}
 
-	write(fd: number, pos: number, data: Uint8Array, offset: number, length: number): TPromise<number> {
+	write(fd: number, pos: number, data: Uint8Array, offset: number, length: number): Thenable<number> {
 		return this._proxy.$write(this._handle, fd, pos, RemoteFileSystemProvider._asBuffer(data), offset, length);
 	}
 }
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index 7c61838cf13d1571b1a39d91574617c5d401afb9..4cf844d61ef2324f32744b08a9b7c4bfc0baf7d4 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -681,20 +681,20 @@ export interface ExtHostWorkspaceShape {
 }
 
 export interface ExtHostFileSystemShape {
-	$stat(handle: number, resource: UriComponents): TPromise<IStat>;
-	$readdir(handle: number, resource: UriComponents): TPromise<[string, FileType][]>;
-	$readFile(handle: number, resource: UriComponents): TPromise<Buffer>;
-	$writeFile(handle: number, resource: UriComponents, content: Buffer, opts: FileWriteOptions): TPromise<void>;
-	$rename(handle: number, resource: UriComponents, target: UriComponents, opts: FileOverwriteOptions): TPromise<void>;
-	$copy(handle: number, resource: UriComponents, target: UriComponents, opts: FileOverwriteOptions): TPromise<void>;
-	$mkdir(handle: number, resource: UriComponents): TPromise<void>;
-	$delete(handle: number, resource: UriComponents, opts: FileDeleteOptions): TPromise<void>;
+	$stat(handle: number, resource: UriComponents): Thenable<IStat>;
+	$readdir(handle: number, resource: UriComponents): Thenable<[string, FileType][]>;
+	$readFile(handle: number, resource: UriComponents): Thenable<Buffer>;
+	$writeFile(handle: number, resource: UriComponents, content: Buffer, opts: FileWriteOptions): Thenable<void>;
+	$rename(handle: number, resource: UriComponents, target: UriComponents, opts: FileOverwriteOptions): Thenable<void>;
+	$copy(handle: number, resource: UriComponents, target: UriComponents, opts: FileOverwriteOptions): Thenable<void>;
+	$mkdir(handle: number, resource: UriComponents): Thenable<void>;
+	$delete(handle: number, resource: UriComponents, opts: FileDeleteOptions): Thenable<void>;
 	$watch(handle: number, session: number, resource: UriComponents, opts: IWatchOptions): void;
 	$unwatch(handle: number, session: number): void;
-	$open(handle: number, resource: UriComponents): TPromise<number>;
-	$close(handle: number, fd: number): TPromise<void>;
-	$read(handle: number, fd: number, pos: number, data: Buffer, offset: number, length: number): TPromise<number>;
-	$write(handle: number, fd: number, pos: number, data: Buffer, offset: number, length: number): TPromise<number>;
+	$open(handle: number, resource: UriComponents): Thenable<number>;
+	$close(handle: number, fd: number): Thenable<void>;
+	$read(handle: number, fd: number, pos: number, data: Buffer, offset: number, length: number): Thenable<number>;
+	$write(handle: number, fd: number, pos: number, data: Buffer, offset: number, length: number): Thenable<number>;
 }
 
 export interface ExtHostSearchShape {
diff --git a/src/vs/workbench/api/node/extHostFileSystem.ts b/src/vs/workbench/api/node/extHostFileSystem.ts
index 6faf26d9b3d7d717264d6dfffcce58fcded2efcb..00a379eb8083a52647b07d387577a3898149ab62 100644
--- a/src/vs/workbench/api/node/extHostFileSystem.ts
+++ b/src/vs/workbench/api/node/extHostFileSystem.ts
@@ -5,12 +5,10 @@
 'use strict';
 
 import { URI, UriComponents } from 'vs/base/common/uri';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { MainContext, IMainContext, ExtHostFileSystemShape, MainThreadFileSystemShape, IFileChangeDto } from './extHost.protocol';
 import * as vscode from 'vscode';
 import * as files from 'vs/platform/files/common/files';
 import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
-import { asWinJsPromise } from 'vs/base/common/async';
 import { values } from 'vs/base/common/map';
 import { Range, FileChangeType } from 'vs/workbench/api/node/extHostTypes';
 import { ExtHostLanguageFeatures } from 'vs/workbench/api/node/extHostLanguageFeatures';
@@ -156,47 +154,43 @@ export class ExtHostFileSystem implements ExtHostFileSystemShape {
 		return { type, ctime, mtime, size };
 	}
 
-	$stat(handle: number, resource: UriComponents): TPromise<files.IStat> {
-		return asWinJsPromise(() => this._fsProvider.get(handle).stat(URI.revive(resource))).then(ExtHostFileSystem._asIStat);
+	$stat(handle: number, resource: UriComponents): Promise<files.IStat> {
+		return Promise.resolve(this._fsProvider.get(handle).stat(URI.revive(resource))).then(ExtHostFileSystem._asIStat);
 	}
 
-	$readdir(handle: number, resource: UriComponents): TPromise<[string, files.FileType][]> {
-		return asWinJsPromise(() => this._fsProvider.get(handle).readDirectory(URI.revive(resource)));
+	$readdir(handle: number, resource: UriComponents): Promise<[string, files.FileType][]> {
+		return Promise.resolve(this._fsProvider.get(handle).readDirectory(URI.revive(resource)));
 	}
 
-	$readFile(handle: number, resource: UriComponents): TPromise<Buffer> {
-		return asWinJsPromise(() => {
-			return this._fsProvider.get(handle).readFile(URI.revive(resource));
-		}).then(data => {
+	$readFile(handle: number, resource: UriComponents): Promise<Buffer> {
+		return Promise.resolve(this._fsProvider.get(handle).readFile(URI.revive(resource))).then(data => {
 			return Buffer.isBuffer(data) ? data : Buffer.from(data.buffer, data.byteOffset, data.byteLength);
 		});
 	}
 
-	$writeFile(handle: number, resource: UriComponents, content: Buffer, opts: files.FileWriteOptions): TPromise<void> {
-		return asWinJsPromise(() => this._fsProvider.get(handle).writeFile(URI.revive(resource), content, opts));
+	$writeFile(handle: number, resource: UriComponents, content: Buffer, opts: files.FileWriteOptions): Promise<void> {
+		return Promise.resolve(this._fsProvider.get(handle).writeFile(URI.revive(resource), content, opts));
 	}
 
-	$delete(handle: number, resource: UriComponents, opts: files.FileDeleteOptions): TPromise<void> {
-		return asWinJsPromise(() => this._fsProvider.get(handle).delete(URI.revive(resource), opts));
+	$delete(handle: number, resource: UriComponents, opts: files.FileDeleteOptions): Promise<void> {
+		return Promise.resolve(this._fsProvider.get(handle).delete(URI.revive(resource), opts));
 	}
 
-	$rename(handle: number, oldUri: UriComponents, newUri: UriComponents, opts: files.FileOverwriteOptions): TPromise<void> {
-		return asWinJsPromise(() => this._fsProvider.get(handle).rename(URI.revive(oldUri), URI.revive(newUri), opts));
+	$rename(handle: number, oldUri: UriComponents, newUri: UriComponents, opts: files.FileOverwriteOptions): Promise<void> {
+		return Promise.resolve(this._fsProvider.get(handle).rename(URI.revive(oldUri), URI.revive(newUri), opts));
 	}
 
-	$copy(handle: number, oldUri: UriComponents, newUri: UriComponents, opts: files.FileOverwriteOptions): TPromise<void> {
-		return asWinJsPromise(() => this._fsProvider.get(handle).copy(URI.revive(oldUri), URI.revive(newUri), opts));
+	$copy(handle: number, oldUri: UriComponents, newUri: UriComponents, opts: files.FileOverwriteOptions): Promise<void> {
+		return Promise.resolve(this._fsProvider.get(handle).copy(URI.revive(oldUri), URI.revive(newUri), opts));
 	}
 
-	$mkdir(handle: number, resource: UriComponents): TPromise<void> {
-		return asWinJsPromise(() => this._fsProvider.get(handle).createDirectory(URI.revive(resource)));
+	$mkdir(handle: number, resource: UriComponents): Promise<void> {
+		return Promise.resolve(this._fsProvider.get(handle).createDirectory(URI.revive(resource)));
 	}
 
 	$watch(handle: number, session: number, resource: UriComponents, opts: files.IWatchOptions): void {
-		asWinJsPromise(() => {
-			let subscription = this._fsProvider.get(handle).watch(URI.revive(resource), opts);
-			this._watches.set(session, subscription);
-		});
+		let subscription = this._fsProvider.get(handle).watch(URI.revive(resource), opts);
+		this._watches.set(session, subscription);
 	}
 
 	$unwatch(session: number): void {
@@ -207,20 +201,20 @@ export class ExtHostFileSystem implements ExtHostFileSystemShape {
 		}
 	}
 
-	$open(handle: number, resource: UriComponents): TPromise<number> {
-		return asWinJsPromise(() => this._fsProvider.get(handle).open(URI.revive(resource)));
+	$open(handle: number, resource: UriComponents): Promise<number> {
+		return Promise.resolve(this._fsProvider.get(handle).open(URI.revive(resource)));
 	}
 
-	$close(handle: number, fd: number): TPromise<void> {
-		return asWinJsPromise(() => this._fsProvider.get(handle).close(fd));
+	$close(handle: number, fd: number): Promise<void> {
+		return Promise.resolve(this._fsProvider.get(handle).close(fd));
 	}
 
-	$read(handle: number, fd: number, pos: number, data: Buffer, offset: number, length: number): TPromise<number> {
-		return asWinJsPromise(() => this._fsProvider.get(handle).read(fd, pos, data, offset, length));
+	$read(handle: number, fd: number, pos: number, data: Buffer, offset: number, length: number): Promise<number> {
+		return Promise.resolve(this._fsProvider.get(handle).read(fd, pos, data, offset, length));
 	}
 
-	$write(handle: number, fd: number, pos: number, data: Buffer, offset: number, length: number): TPromise<number> {
-		return asWinJsPromise(() => this._fsProvider.get(handle).write(fd, pos, data, offset, length));
+	$write(handle: number, fd: number, pos: number, data: Buffer, offset: number, length: number): Promise<number> {
+		return Promise.resolve(this._fsProvider.get(handle).write(fd, pos, data, offset, length));
 	}
 
 }
diff --git a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
index 3ad00f570a7cc0186c496238ed9e66d75e46178d..881b1dec78abffc150a4a3dd7e838697bb8e35b8 100644
--- a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
+++ b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
@@ -38,7 +38,7 @@ class TypeOnlyStat implements IStat {
 	size: number = 0;
 }
 
-function toIFileStat(provider: IFileSystemProvider, tuple: [URI, IStat], recurse?: (tuple: [URI, IStat]) => boolean): TPromise<IFileStat> {
+function toIFileStat(provider: IFileSystemProvider, tuple: [URI, IStat], recurse?: (tuple: [URI, IStat]) => boolean): Thenable<IFileStat> {
 	const [resource, stat] = tuple;
 	const fileStat: IFileStat = {
 		resource,
@@ -72,7 +72,7 @@ function toIFileStat(provider: IFileSystemProvider, tuple: [URI, IStat], recurse
 	return TPromise.as(fileStat);
 }
 
-export function toDeepIFileStat(provider: IFileSystemProvider, tuple: [URI, IStat], to: URI[]): TPromise<IFileStat> {
+export function toDeepIFileStat(provider: IFileSystemProvider, tuple: [URI, IStat], to: URI[]): Thenable<IFileStat> {
 
 	const trie = TernarySearchTree.forPaths<true>();
 	trie.set(tuple[0].toString(), true);