diff --git a/gulpfile.js b/gulpfile.js
index 0bc339e5b5..ef0d622b70 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -34,8 +34,8 @@ function version() {
 
 gulp.task('clean', clean);
 gulp.task('webfonts', ['clean'], webfonts);
-gulp.task('prebuild', ['webfonts']);
 gulp.task('cleanupNodeTypes', cleanupNodeTypes);
-gulp.task('predist', ['cleanupNodeTypes']);
+gulp.task('prebuild', ['webfonts']);
+gulp.task('prebuild:prod', ['prebuild', 'cleanupNodeTypes']);
 gulp.task('version', version);
 gulp.task('postdist', ['version']);
diff --git a/package.json b/package.json
index 2a45d2ec71..23b4c3363a 100644
--- a/package.json
+++ b/package.json
@@ -8,15 +8,15 @@
     "postinstall": "npm run sub:init",
     "build": "gulp prebuild && webpack --config webpack.config.js",
     "build:watch": "gulp prebuild && webpack-serve --config webpack.config.js",
-    "build:prod": "gulp prebuild && cross-env NODE_ENV=production webpack --config webpack.config.js",
-    "build:prod:watch": "gulp prebuild && cross-env NODE_ENV=production webpack-serve --config webpack.config.js",
+    "build:prod": "gulp prebuild:prod && cross-env NODE_ENV=production webpack --config webpack.config.js",
+    "build:prod:watch": "gulp prebuild:prod && cross-env NODE_ENV=production webpack-serve --config webpack.config.js",
     "build:selfhost": "gulp prebuild && cross-env SELF_HOST=true webpack-serve --config webpack.config.js",
     "build:selfhost:watch": "gulp prebuild && cross-env SELF_HOST=true webpack-serve --config webpack.config.js",
-    "build:selfhost:prod": "gulp prebuild && cross-env SELF_HOST=true NODE_ENV=production webpack --config webpack.config.js",
-    "build:selfhost:prod:watch": "gulp prebuild && cross-env SELF_HOST=true NODE_ENV=production webpack-serve --config webpack.config.js",
+    "build:selfhost:prod": "gulp prebuild:prod && cross-env SELF_HOST=true NODE_ENV=production webpack --config webpack.config.js",
+    "build:selfhost:prod:watch": "gulp prebuild:prod && cross-env SELF_HOST=true NODE_ENV=production webpack-serve --config webpack.config.js",
     "clean:l10n": "git push origin --delete l10n_master",
-    "dist": "gulp predist && npm run build:prod && gulp postdist",
-    "dist:selfhost": "gulp predist && npm run build:selfhost:prod && gulp postdist",
+    "dist": "npm run build:prod && gulp postdist",
+    "dist:selfhost": "npm run build:selfhost:prod && gulp postdist",
     "deploy": "npm run dist && gh-pages -d build",
     "lint": "tslint src/**/*.ts || true",
     "lint:fix": "tslint src/**/*.ts --fix"