diff --git a/dist/client/preview/render.js b/dist/client/preview/render.js
index 02ad5f1d0c76..554c7a075963 100644
--- a/dist/client/preview/render.js
+++ b/dist/client/preview/render.js
@@ -7,8 +7,6 @@ exports.renderError = renderError;
 exports.renderMain = renderMain;
 exports.default = renderPreview;
 
-require('airbnb-js-shims');
-
 var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
diff --git a/dist/server/build.js b/dist/server/build.js
old mode 100644
new mode 100755
diff --git a/dist/server/config/babel.js b/dist/server/config/babel.js
index 8913db6109d8..5fbbb51dee67 100644
--- a/dist/server/config/babel.js
+++ b/dist/server/config/babel.js
@@ -35,8 +35,8 @@ module.exports = {
   require.resolve('babel-plugin-transform-regenerator'),
   // Polyfills the runtime needed for async/await and generators
   [require.resolve('babel-plugin-transform-runtime'), {
-    helpers: false,
-    polyfill: false,
+    helpers: true,
+    polyfill: true,
     regenerator: true
   }]]
 };
\ No newline at end of file
diff --git a/dist/server/config/babel.prod.js b/dist/server/config/babel.prod.js
index 79282446799f..f3af97e5e486 100644
--- a/dist/server/config/babel.prod.js
+++ b/dist/server/config/babel.prod.js
@@ -32,8 +32,8 @@ module.exports = {
   require.resolve('babel-plugin-transform-regenerator'),
   // Polyfills the runtime needed for async/await and generators
   [require.resolve('babel-plugin-transform-runtime'), {
-    helpers: false,
-    polyfill: false,
+    helpers: true,
+    polyfill: true,
     regenerator: true
   }],
   // Optimization: hoist JSX that never changes out of render()
diff --git a/dist/server/config/polyfills.js b/dist/server/config/polyfills.js
deleted file mode 100644
index 06a1cfcbdf68..000000000000
--- a/dist/server/config/polyfills.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-
-require('es6-shim');
\ No newline at end of file
diff --git a/dist/server/config/webpack.config.js b/dist/server/config/webpack.config.js
index 65a1ba3ff30b..76676c8d17c7 100644
--- a/dist/server/config/webpack.config.js
+++ b/dist/server/config/webpack.config.js
@@ -23,8 +23,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var config = {
   devtool: '#cheap-module-eval-source-map',
   entry: {
-    manager: [require.resolve('./polyfills'), require.resolve('../../client/manager')],
-    preview: [require.resolve('./polyfills'), require.resolve('./error_enhancements'), require.resolve('webpack-hot-middleware/client') + '?noInfo=true']
+    manager: [require.resolve('../../client/manager')],
+    preview: [require.resolve('./error_enhancements'), require.resolve('webpack-hot-middleware/client') + '?noInfo=true']
   },
   output: {
     path: _path2.default.join(__dirname, 'dist'),
diff --git a/dist/server/config/webpack.config.prod.js b/dist/server/config/webpack.config.prod.js
index abae8f427c5e..1a8912da3293 100644
--- a/dist/server/config/webpack.config.prod.js
+++ b/dist/server/config/webpack.config.prod.js
@@ -17,8 +17,8 @@ var _utils = require('./utils');
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var entries = {
-  preview: [_path2.default.resolve(__dirname, './polyfills')],
-  manager: [_path2.default.resolve(__dirname, './polyfills'), _path2.default.resolve(__dirname, '../../client/manager')]
+  preview: [],
+  manager: [_path2.default.resolve(__dirname, '../../client/manager')]
 };
 
 var config = {
diff --git a/package.json b/package.json
index d507ea4666f3..59391b0142f1 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,6 @@
     "@kadira/storybook-addons": "^1.3.1",
     "@kadira/storybook-channel-pagebus": "^2.0.2",
     "@kadira/storybook-ui": "^3.3.1",
-    "airbnb-js-shims": "^1.0.0",
     "autoprefixer": "^6.3.7",
     "babel-core": "^6.11.4",
     "babel-loader": "^6.2.4",
@@ -47,7 +46,6 @@
     "commander": "^2.9.0",
     "configstore": "^2.0.0",
     "css-loader": "0.23.1",
-    "es6-shim": "^0.35.1",
     "express": "^4.13.3",
     "file-loader": "^0.9.0",
     "json-loader": "^0.5.4",
diff --git a/src/client/preview/render.js b/src/client/preview/render.js
index bf1dbc1b61d6..4f97e7a93777 100644
--- a/src/client/preview/render.js
+++ b/src/client/preview/render.js
@@ -1,4 +1,3 @@
-import 'airbnb-js-shims';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import ErrorDisplay from './error_display';
diff --git a/src/server/config/babel.js b/src/server/config/babel.js
index 2fc1fa52eb6e..248c1be447d5 100644
--- a/src/server/config/babel.js
+++ b/src/server/config/babel.js
@@ -34,8 +34,8 @@ module.exports = {
     require.resolve('babel-plugin-transform-regenerator'),
     // Polyfills the runtime needed for async/await and generators
     [require.resolve('babel-plugin-transform-runtime'), {
-      helpers: false,
-      polyfill: false,
+      helpers: true,
+      polyfill: true,
       regenerator: true,
     }],
   ],
diff --git a/src/server/config/babel.prod.js b/src/server/config/babel.prod.js
index c88600979e01..6f7f120b0029 100644
--- a/src/server/config/babel.prod.js
+++ b/src/server/config/babel.prod.js
@@ -31,8 +31,8 @@ module.exports = {
     require.resolve('babel-plugin-transform-regenerator'),
     // Polyfills the runtime needed for async/await and generators
     [require.resolve('babel-plugin-transform-runtime'), {
-      helpers: false,
-      polyfill: false,
+      helpers: true,
+      polyfill: true,
       regenerator: true,
     }],
     // Optimization: hoist JSX that never changes out of render()
diff --git a/src/server/config/polyfills.js b/src/server/config/polyfills.js
deleted file mode 100644
index 0617f5e3063f..000000000000
--- a/src/server/config/polyfills.js
+++ /dev/null
@@ -1 +0,0 @@
-import 'es6-shim';
diff --git a/src/server/config/webpack.config.js b/src/server/config/webpack.config.js
index 0923a41ff51f..5ec8153d476a 100644
--- a/src/server/config/webpack.config.js
+++ b/src/server/config/webpack.config.js
@@ -7,11 +7,9 @@ const config = {
   devtool: '#cheap-module-eval-source-map',
   entry: {
     manager: [
-      require.resolve('./polyfills'),
       require.resolve('../../client/manager'),
     ],
     preview: [
-      require.resolve('./polyfills'),
       require.resolve('./error_enhancements'),
       `${require.resolve('webpack-hot-middleware/client')}?noInfo=true`,
     ],
diff --git a/src/server/config/webpack.config.prod.js b/src/server/config/webpack.config.prod.js
index dda95ad0fe22..889e1cc7f1be 100644
--- a/src/server/config/webpack.config.prod.js
+++ b/src/server/config/webpack.config.prod.js
@@ -3,11 +3,8 @@ import webpack from 'webpack';
 import { OccurenceOrderPlugin, includePaths, excludePaths } from './utils';
 
 const entries = {
-  preview: [
-    path.resolve(__dirname, './polyfills'),
-  ],
+  preview: [],
   manager: [
-    path.resolve(__dirname, './polyfills'),
     path.resolve(__dirname, '../../client/manager'),
   ],
 };