diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
index b7c6419e073986ab7baba1c3b6d29975e434216a..d60299f35ddc673e3ad4945360b1469dcf6a47a8 100644
--- a/src/vs/code/node/cliProcessMain.ts
+++ b/src/vs/code/node/cliProcessMain.ts
@@ -30,6 +30,7 @@ import { RequestService } from 'vs/platform/request/node/requestService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { NodeConfigurationService } from 'vs/platform/configuration/node/nodeConfigurationService';
 import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender';
+import {mkdirp} from 'vs/base/node/pfs';
 
 const notFound = id => localize('notFound', "Extension '{0}' not found.", id);
 const notInstalled = id => localize('notInstalled', "Extension '{0}' is not installed.", id);
@@ -151,7 +152,7 @@ export function main(argv: ParsedArgs): TPromise<void> {
 	return instantiationService.invokeFunction(accessor => {
 		const envService = accessor.get(IEnvironmentService);
 
-		return envService.createPaths().then(() => {
+		return TPromise.join([envService.userHome, envService.extensionsPath].map(p => mkdirp(p))).then(() => {
 			const { appRoot, extensionsPath, extensionDevelopmentPath, isBuilt } = envService;
 
 			const services = new ServiceCollection();
diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts
index 93ec5be66d4c7677fa1dfef13887e1645962ebf5..3e3e873aea182551f6e2b710a0938a1039d22565 100644
--- a/src/vs/platform/environment/common/environment.ts
+++ b/src/vs/platform/environment/common/environment.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { TPromise } from 'vs/base/common/winjs.base';
 
 export const IEnvironmentService = createDecorator<IEnvironmentService>('environmentService');
 
@@ -27,6 +26,4 @@ export interface IEnvironmentService {
 	verbose: boolean;
 
 	debugBrkFileWatcherPort: number;
-
-	createPaths(): TPromise<void>;
 }
\ No newline at end of file
diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts
index 7d2a61e150e749c43537265913f4d94dc5b02053..190f166dfb60374145b4172fd03d784214ea9a44 100644
--- a/src/vs/platform/environment/node/environmentService.ts
+++ b/src/vs/platform/environment/node/environmentService.ts
@@ -9,10 +9,8 @@ import product from 'vs/platform/product';
 import pkg from 'vs/platform/package';
 import * as os from 'os';
 import * as path from 'path';
-import {mkdirp} from 'vs/base/node/pfs';
 import {ParsedArgs} from 'vs/code/node/argv';
 import URI from 'vs/base/common/uri';
-import {TPromise} from 'vs/base/common/winjs.base';
 
 export class EnvironmentService implements IEnvironmentService {
 
@@ -61,10 +59,4 @@ export class EnvironmentService implements IEnvironmentService {
 
 		this._extensionDevelopmentPath = argv.extensionDevelopmentPath;
 	}
-
-	createPaths(): TPromise<void> {
-		const promises = [this.userHome, this.extensionsPath].map(p => mkdirp(p));
-
-		return TPromise.join(promises) as TPromise<any>;
-	}
 }
\ No newline at end of file