diff --git a/app/javascript/packs/index.jsx b/app/javascript/packs/index.jsx
index 7f94d83c5..6c62288ad 100644
--- a/app/javascript/packs/index.jsx
+++ b/app/javascript/packs/index.jsx
@@ -1,3 +1,4 @@
+import "babel-polyfill";
 import "intl";
 import "intl/locale-data/jsonp/en-US.js"
 import React from "react";
diff --git a/features/support/env.rb b/features/support/env.rb
index 999da7c0f..0f55cb7eb 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -9,16 +9,9 @@ require 'capybara/cucumber'
 require 'capybara-webkit'
 require 'simplecov'
 require 'headless'
-require 'selenium-webdriver'
 
-
-Capybara.default_driver = :selenium
-if Capybara.current_driver == :selenium
-  require 'headless'
-
-  headless = Headless.new
-  headless.start
-end
+headless = Headless.new
+headless.start
 
 Capybara::Webkit.configure do |config|
   # Enable debug mode. Prints a log of everything the driver is doing.
diff --git a/lib/tasks/cucumber.rake b/lib/tasks/cucumber.rake
index 60b38b2df..4f49402f2 100644
--- a/lib/tasks/cucumber.rake
+++ b/lib/tasks/cucumber.rake
@@ -3,7 +3,7 @@
 # newer version of cucumber-rails. Consider adding your own code to a new file
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
-ENV["RAILS_ENV"] ||= 'test'
+
 # Don't load anything when running the gems:* tasks
 unless ARGV.any? { |a| a =~ /^gems/ }
 
diff --git a/package.json b/package.json
index 536ae64b5..a35cd4830 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-object-rest-spread": "^6.23.0",
+    "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.6.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",
diff --git a/yarn.lock b/yarn.lock
index 5734fb723..f4cdc05b0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -800,7 +800,7 @@ babel-plugin-transform-strict-mode@^6.24.1:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-polyfill@^6.23.0:
+babel-polyfill@^6.23.0, babel-polyfill@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
   dependencies: