diff --git a/.babelrc b/.babelrc
index ed9a07e8a1..f9fc678369 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,3 +1,21 @@
 {
-  "presets": ["es2015-without-strict"]
+  "plugins": ["check-es2015-constants",
+              "transform-es2015-arrow-functions",
+              "transform-es2015-block-scoped-functions",
+              "transform-es2015-block-scoping",
+              "transform-es2015-classes",
+              "transform-es2015-computed-properties",
+              "transform-es2015-destructuring",
+              "transform-es2015-duplicate-keys",
+              "transform-es2015-for-of",
+              "transform-es2015-function-name",
+              "transform-es2015-literals",
+              "transform-es2015-object-super",
+              "transform-es2015-parameters",
+              "transform-es2015-shorthand-properties",
+              "transform-es2015-spread",
+              "transform-es2015-sticky-regex",
+              "transform-es2015-template-literals",
+              "transform-es2015-unicode-regex",
+              "transform-regenerator"]
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 10e0eb3ee9..22c3d8f4fc 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,25 @@
   "devDependencies": {
     "async": "^2.1.2",
     "babel-cli": "^6.16.0",
-    "babel-preset-es2015-without-strict": "0.0.4",
+    "babel-plugin-check-es2015-constants": "^6.8.0",
+    "babel-plugin-transform-es2015-arrow-functions": "^6.8.0",
+    "babel-plugin-transform-es2015-block-scoped-functions": "^6.8.0",
+    "babel-plugin-transform-es2015-block-scoping": "^6.18.0",
+    "babel-plugin-transform-es2015-classes": "^6.18.0",
+    "babel-plugin-transform-es2015-computed-properties": "^6.8.0",
+    "babel-plugin-transform-es2015-destructuring": "^6.18.0",
+    "babel-plugin-transform-es2015-duplicate-keys": "^6.8.0",
+    "babel-plugin-transform-es2015-for-of": "^6.18.0",
+    "babel-plugin-transform-es2015-function-name": "^6.9.0",
+    "babel-plugin-transform-es2015-literals": "^6.8.0",
+    "babel-plugin-transform-es2015-object-super": "^6.8.0",
+    "babel-plugin-transform-es2015-parameters": "^6.18.0",
+    "babel-plugin-transform-es2015-shorthand-properties": "^6.18.0",
+    "babel-plugin-transform-es2015-spread": "^6.8.0",
+    "babel-plugin-transform-es2015-sticky-regex": "^6.8.0",
+    "babel-plugin-transform-es2015-template-literals": "^6.8.0",
+    "babel-plugin-transform-es2015-unicode-regex": "^6.11.0",
+    "babel-plugin-transform-regenerator": "^6.16.1",
     "brace": "^0.8.0",
     "browserify": "^13.0.0",
     "csslint": "^1.0.2",