diff --git a/src/cli/index.build.js b/src/cli/index.build.js
deleted file mode 100644
index e62866a9af19..000000000000
--- a/src/cli/index.build.js
+++ /dev/null
@@ -1,12 +0,0 @@
-var _ = require('lodash');
-var fromRoot = require('requirefrom')('src/utils')('fromRoot');
-
-var babelOpts = _.defaults({
-  ignore: [
-    fromRoot('src'),
-    /[\\\/](node_modules|bower_components)[\\\/]/
-  ]
-}, require('../optimize/babelOptions').node);
-
-require('babel/register')(babelOpts);
-require('./cli');
diff --git a/src/optimize/babelOptions.build.js b/src/optimize/babelOptions.build.js
new file mode 100644
index 000000000000..b728bbe1ed2c
--- /dev/null
+++ b/src/optimize/babelOptions.build.js
@@ -0,0 +1,14 @@
+var fromRoot = require('requirefrom')('src/utils')('fromRoot');
+
+exports.webpack = {
+  stage: 1,
+  nonStandard: false,
+  optional: ['runtime']
+};
+
+exports.node = Object.assign({
+  ignore: [
+    fromRoot('src'),
+    /[\\\/](node_modules|bower_components)[\\\/]/
+  ]
+}, exports.webpack);
diff --git a/tasks/build/babelOptions.js b/tasks/build/babelOptions.js
new file mode 100644
index 000000000000..c048db56684f
--- /dev/null
+++ b/tasks/build/babelOptions.js
@@ -0,0 +1,13 @@
+module.exports = function (grunt) {
+
+  var srcFile = 'build/kibana/src/optimize/babelOptions.js';
+  var buildFile = 'build/kibana/src/optimize/babelOptions.build.js';
+  var rename = require('fs').renameSync;
+  var unlink = require('fs').unlinkSync;
+
+  grunt.registerTask('_build:babelOptions', function () {
+    unlink(srcFile);
+    rename(buildFile, srcFile);
+  });
+
+};
diff --git a/tasks/build/cliIndex.js b/tasks/build/cliIndex.js
deleted file mode 100644
index d6850998c922..000000000000
--- a/tasks/build/cliIndex.js
+++ /dev/null
@@ -1,13 +0,0 @@
-module.exports = function (grunt) {
-
-  var srcFile = 'build/kibana/src/cli/index.js';
-  var buildFile = 'build/kibana/src/cli/index.build.js';
-  var rename = require('fs').renameSync;
-  var unlink = require('fs').unlinkSync;
-
-  grunt.registerTask('_build:cliIndex', function () {
-    unlink(srcFile);
-    rename(buildFile, srcFile);
-  });
-
-};
diff --git a/tasks/build/index.js b/tasks/build/index.js
index 419576086447..b835d4c0beab 100644
--- a/tasks/build/index.js
+++ b/tasks/build/index.js
@@ -9,7 +9,7 @@ module.exports = function (grunt) {
     '_build:downloadNodeBuilds:start',
     'copy:devSource',
     'babel:build',
-    '_build:cliIndex',
+    '_build:babelOptions',
     '_build:installedPlugins',
     '_build:packageJson',
     '_build:readme',
diff --git a/tasks/build/shrinkwrap.js b/tasks/build/shrinkwrap.js
index b56228941d3a..ef8001d99441 100644
--- a/tasks/build/shrinkwrap.js
+++ b/tasks/build/shrinkwrap.js
@@ -13,7 +13,7 @@ module.exports = function (grunt) {
       if (e.code !== 'ENOENT') throw e;
 
       if (createIfMissing) {
-        exec('npm', ['shrinkwrap', '--dev', '--logLevel', 'error']);
+        exec('npm', ['shrinkwrap', '--dev', '--loglevel', 'error']);
         newFiles.push(shrinkwrapFile);
       }
       else grunt.fail.warn('Releases require an npm-shrinkwrap.json file to exist');
@@ -28,7 +28,7 @@ module.exports = function (grunt) {
     exec('cp', ['npm-shrinkwrap.json', join(config.get('root'), 'build', 'kibana', 'npm-shrinkwrap.build.json')]);
 
     // create shrinkwrap without dev dependencies and copy to build
-    exec('npm', ['shrinkwrap', '--logLevel', 'error']);
+    exec('npm', ['shrinkwrap', '--loglevel', 'error']);
     exec('cp', ['npm-shrinkwrap.json', join(config.get('root'), 'build', 'kibana', 'npm-shrinkwrap.json')]);
 
     // restore the dev shrinkwrap