diff --git a/client/configuration/webpack/webpack.config.dev.js b/client/configuration/webpack/webpack.config.dev.js
index 00fe1154..e8a9db9e 100644
--- a/client/configuration/webpack/webpack.config.dev.js
+++ b/client/configuration/webpack/webpack.config.dev.js
@@ -13,8 +13,8 @@ module.exports = {
   entry: [
     "webpack-hot-middleware/client?quiet=true&noInfo=true",
     require.resolve("react-hot-loader/patch"),
-    require.resolve("../polyfills/polyfills"),
-    path.join(src, "index")
+    "babel-polyfill",
+    "./src/index"
   ],
   output: {
     path: path.resolve("build"),
diff --git a/client/configuration/webpack/webpack.config.prod.js b/client/configuration/webpack/webpack.config.prod.js
index 7012c139..6be852cc 100644
--- a/client/configuration/webpack/webpack.config.prod.js
+++ b/client/configuration/webpack/webpack.config.prod.js
@@ -17,12 +17,10 @@ module.exports = {
   bail: true,
   cache: false,
   devtool: "cheap-source-map",
-  // XXX todo: why are we using our own polyfill and not babel-polyfill?
-  entry: [require.resolve("../polyfills/polyfills"), path.join(src, "index")],
+  entry: ["babel-polyfill", "./src/index"],
   output: {
     path: path.resolve("build"),
     filename: "static/js/[name].[chunkhash:8].js",
-    // chunkFilename: "static/js/[name].[chunkhash:8].chunk.js",
     publicPath
   },
   module: {