diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts
index 632ecd517ab..4349d32b4f8 100644
--- a/src/vs/code/electron-main/main.ts
+++ b/src/vs/code/electron-main/main.ts
@@ -81,7 +81,7 @@ function createServices(args: ParsedArgs, bufferLogService: BufferLogService): I
 /**
  * Cleans up older logs, while keeping the 10 most recent ones.
 */
-async function cleanupOlderLogs(environmentService: EnvironmentService): TPromise<void> {
+async function cleanupOlderLogs(environmentService: EnvironmentService): Promise<void> {
 	const currentLog = path.basename(environmentService.logsPath);
 	const logsRoot = path.dirname(environmentService.logsPath);
 	const children = await readdir(logsRoot);
diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts
index 0c5a6074797..5dfbc3be44a 100644
--- a/src/vs/code/node/cli.ts
+++ b/src/vs/code/node/cli.ts
@@ -31,7 +31,7 @@ interface IMainCli {
 	main: (argv: ParsedArgs) => TPromise<void>;
 }
 
-export async function main(argv: string[]): TPromise<any> {
+export async function main(argv: string[]): Promise<any> {
 	let args: ParsedArgs;
 
 	try {
diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
index bbe1f8c04ba..396dd120f12 100644
--- a/src/vs/code/node/cliProcessMain.ts
+++ b/src/vs/code/node/cliProcessMain.ts
@@ -181,7 +181,7 @@ class Main {
 	}
 
 	private uninstallExtension(extensions: string[]): TPromise<any> {
-		async function getExtensionId(extensionDescription: string): TPromise<string> {
+		async function getExtensionId(extensionDescription: string): Promise<string> {
 			if (!/\.vsix$/i.test(extensionDescription)) {
 				return extensionDescription;
 			}
diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 5752c45c955..4cdee22f254 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -687,7 +687,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
 		return promise;
 	}
 
-	private async postUninstallExtension(extension: ILocalExtension, error?: Error): TPromise<void> {
+	private async postUninstallExtension(extension: ILocalExtension, error?: Error): Promise<void> {
 		if (error) {
 			this.logService.error('Failed to uninstall extension:', extension.identifier.id, error.message);
 		} else {
diff --git a/src/vs/platform/request/node/requestService.ts b/src/vs/platform/request/node/requestService.ts
index 0f57b4e35ba..84a66a3ca52 100644
--- a/src/vs/platform/request/node/requestService.ts
+++ b/src/vs/platform/request/node/requestService.ts
@@ -40,18 +40,21 @@ export class RequestService implements IRequestService {
 		this.authorization = config.http && config.http.proxyAuthorization;
 	}
 
-	async request(options: IRequestOptions, requestFn: IRequestFunction = request): TPromise<IRequestContext> {
+	request(options: IRequestOptions, requestFn: IRequestFunction = request): TPromise<IRequestContext> {
 		this.logService.trace('RequestService#request', options.url);
 
 		const { proxyUrl, strictSSL } = this;
+		const agentPromise = options.agent ? TPromise.wrap(options.agent) : TPromise.wrap(getProxyAgent(options.url, { proxyUrl, strictSSL }));
 
-		options.agent = options.agent || await getProxyAgent(options.url, { proxyUrl, strictSSL });
-		options.strictSSL = strictSSL;
+		return agentPromise.then(agent => {
+			options.agent = agent;
+			options.strictSSL = strictSSL;
 
-		if (this.authorization) {
-			options.headers = assign(options.headers || {}, { 'Proxy-Authorization': this.authorization });
-		}
+			if (this.authorization) {
+				options.headers = assign(options.headers || {}, { 'Proxy-Authorization': this.authorization });
+			}
 
-		return requestFn(options);
+			return requestFn(options);
+		});
 	}
 }