diff --git a/build/lib/extensions.js b/build/lib/extensions.js
index 30efd92bfffef2baa2dbd3356922f1aa9bc42edc..e415440842f49441534347e2f13f80618bf3bf00 100644
--- a/build/lib/extensions.js
+++ b/build/lib/extensions.js
@@ -25,7 +25,6 @@ var vsce = require("vsce");
 var stats_1 = require("./stats");
 var util2 = require("./util");
 var remote = require("gulp-remote-src");
-var flatmap = require('gulp-flatmap');
 var vzip = require('gulp-vinyl-zip');
 var filter = require('gulp-filter');
 var rename = require('gulp-rename');
@@ -44,7 +43,6 @@ function fromLocal(extensionPath, sourceMappingURLBase) {
         return fromLocalNormal(extensionPath);
     }
 }
-exports.fromLocal = fromLocal;
 function fromLocalWebpack(extensionPath, sourceMappingURLBase) {
     var result = es.through();
     var packagedDependencies = [];
@@ -173,18 +171,15 @@ function fromMarketplace(extensionName, version, metadata) {
             headers: baseHeaders
         }
     };
+    var packageJsonFilter = filter('package.json', { restore: true });
     return remote('', options)
-        .pipe(flatmap(function (stream) {
-        var packageJsonFilter = filter('package.json', { restore: true });
-        return stream
-            .pipe(vzip.src())
-            .pipe(filter('extension/**'))
-            .pipe(rename(function (p) { return p.dirname = p.dirname.replace(/^extension\/?/, ''); }))
-            .pipe(packageJsonFilter)
-            .pipe(buffer())
-            .pipe(json({ __metadata: metadata }))
-            .pipe(packageJsonFilter.restore);
-    }));
+        .pipe(vzip.src())
+        .pipe(filter('extension/**'))
+        .pipe(rename(function (p) { return p.dirname = p.dirname.replace(/^extension\/?/, ''); }))
+        .pipe(packageJsonFilter)
+        .pipe(buffer())
+        .pipe(json({ __metadata: metadata }))
+        .pipe(packageJsonFilter.restore);
 }
 exports.fromMarketplace = fromMarketplace;
 var excludedExtensions = [
diff --git a/build/lib/extensions.ts b/build/lib/extensions.ts
index b48a639072dfe343b03bf296cbc1a28f63b99cea..c9734e8bd3c7a73c18becb19fbe8ab36997318bc 100644
--- a/build/lib/extensions.ts
+++ b/build/lib/extensions.ts
@@ -14,7 +14,6 @@ import * as vsce from 'vsce';
 import { createStatsStream } from './stats';
 import * as util2 from './util';
 import remote = require('gulp-remote-src');
-const flatmap = require('gulp-flatmap');
 const vzip = require('gulp-vinyl-zip');
 const filter = require('gulp-filter');
 const rename = require('gulp-rename');
@@ -26,7 +25,7 @@ const webpackGulp = require('webpack-stream');
 
 const root = path.resolve(path.join(__dirname, '..', '..'));
 
-export function fromLocal(extensionPath: string, sourceMappingURLBase?: string): Stream {
+function fromLocal(extensionPath: string, sourceMappingURLBase?: string): Stream {
 	const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
 	if (fs.existsSync(webpackFilename)) {
 		return fromLocalWebpack(extensionPath, sourceMappingURLBase);
@@ -201,19 +200,16 @@ export function fromMarketplace(extensionName: string, version: string, metadata
 		}
 	};
 
+	const packageJsonFilter = filter('package.json', { restore: true });
+
 	return remote('', options)
-		.pipe(flatmap(stream => {
-			const packageJsonFilter = filter('package.json', { restore: true });
-
-			return stream
-				.pipe(vzip.src())
-				.pipe(filter('extension/**'))
-				.pipe(rename(p => p.dirname = p.dirname.replace(/^extension\/?/, '')))
-				.pipe(packageJsonFilter)
-				.pipe(buffer())
-				.pipe(json({ __metadata: metadata }))
-				.pipe(packageJsonFilter.restore);
-		}));
+		.pipe(vzip.src())
+		.pipe(filter('extension/**'))
+		.pipe(rename(p => p.dirname = p.dirname.replace(/^extension\/?/, '')))
+		.pipe(packageJsonFilter)
+		.pipe(buffer())
+		.pipe(json({ __metadata: metadata }))
+		.pipe(packageJsonFilter.restore);
 }
 
 interface IPackageExtensionsOptions {