diff --git a/packages/babel-preset-stage-2/package.json b/packages/babel-preset-stage-2/package.json
index b3544abb91..0c9c61975d 100644
--- a/packages/babel-preset-stage-2/package.json
+++ b/packages/babel-preset-stage-2/package.json
@@ -11,7 +11,6 @@
     "babel-plugin-transform-async-generator-functions": "^6.16.0",
     "babel-plugin-transform-class-properties": "^6.16.0",
     "babel-plugin-transform-decorators": "^6.13.0",
-    "babel-plugin-transform-object-rest-spread": "^6.16.0",
     "babel-preset-stage-3": "^6.16.0"
   }
 }
diff --git a/packages/babel-preset-stage-2/src/index.js b/packages/babel-preset-stage-2/src/index.js
index 9806a625cb..88f02d6218 100644
--- a/packages/babel-preset-stage-2/src/index.js
+++ b/packages/babel-preset-stage-2/src/index.js
@@ -1,16 +1,16 @@
 import presetStage3 from "babel-preset-stage-3";
 
 import transformClassProperties from "babel-plugin-transform-class-properties";
-import transformObjectRestSpread from "babel-plugin-transform-object-rest-spread";
 import transformDecorators from "babel-plugin-transform-decorators";
+import transformAsyncGeneratorFunctions from "babel-plugin-transform-async-generator-functions";
 
 export default {
   presets: [
     presetStage3
   ],
   plugins: [
+    transformAsyncGeneratorFunctions,
     transformClassProperties,
-    transformObjectRestSpread,
     transformDecorators
   ]
 };
diff --git a/packages/babel-preset-stage-3/package.json b/packages/babel-preset-stage-3/package.json
index 5ab358d981..bc47127fbc 100644
--- a/packages/babel-preset-stage-3/package.json
+++ b/packages/babel-preset-stage-3/package.json
@@ -10,6 +10,7 @@
   "dependencies": {
     "babel-plugin-syntax-trailing-function-commas": "^6.3.13",
     "babel-plugin-transform-async-to-generator": "^6.16.0",
-    "babel-plugin-transform-exponentiation-operator": "^6.3.13"
+    "babel-plugin-transform-exponentiation-operator": "^6.3.13",
+    "babel-plugin-transform-object-rest-spread": "^6.16.0"
   }
 }
diff --git a/packages/babel-preset-stage-3/src/index.js b/packages/babel-preset-stage-3/src/index.js
index 3eaa913ebd..780a83fba4 100644
--- a/packages/babel-preset-stage-3/src/index.js
+++ b/packages/babel-preset-stage-3/src/index.js
@@ -1,11 +1,13 @@
 import syntaxTrailingFunctionCommas from "babel-plugin-syntax-trailing-function-commas";
 import transformAsyncToGenerator from "babel-plugin-transform-async-to-generator";
 import transformExponentiationOperator from "babel-plugin-transform-exponentiation-operator";
+import transformObjectRestSpread from "babel-plugin-transform-object-rest-spread";
 
 export default {
   plugins: [
-    syntaxTrailingFunctionCommas,
-    transformAsyncToGenerator,
-    transformExponentiationOperator
+    syntaxTrailingFunctionCommas, // in ES2017 (remove as a breaking change)
+    transformAsyncToGenerator, // in ES2017 (remove as a breaking change)
+    transformExponentiationOperator,  // in ES2016 (remove as a breaking change)
+    transformObjectRestSpread
   ]
 };