diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-hoisting/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-hoisting/expected.js
index 3fe83b718c..03d6a86460 100644
--- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-hoisting/expected.js
+++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-hoisting/expected.js
@@ -1,4 +1,4 @@
-var _taggedTemplateLiteral = require("babel-runtime/helpers/taggedTemplateLiteral").default;
+var _taggedTemplateLiteral = require("babel-runtime/helpers/taggedTemplateLiteral");
 
 var _templateObject = _taggedTemplateLiteral(["foo"], ["foo"]);
 
diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/multi-load/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/multi-load/expected.js
index a25580a1aa..9a77982e45 100644
--- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/multi-load/expected.js
+++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/multi-load/expected.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var _interopRequireDefault3 = require("babel-runtime/helpers/interopRequireDefault").default;
+var _interopRequireDefault3 = require("babel-runtime/helpers/interopRequireDefault");
 
 var _interopRequireDefault2 = _interopRequireDefault3(require("babel-runtime/helpers/interopRequireDefault"));
 
diff --git a/packages/babel-plugin-transform-regenerator/test/fixtures/regression/T7041/expected.js b/packages/babel-plugin-transform-regenerator/test/fixtures/regression/T7041/expected.js
index db75009829..ca7c85f631 100644
--- a/packages/babel-plugin-transform-regenerator/test/fixtures/regression/T7041/expected.js
+++ b/packages/babel-plugin-transform-regenerator/test/fixtures/regression/T7041/expected.js
@@ -1,6 +1,6 @@
-var _regeneratorRuntime = require("babel-runtime/regenerator").default;
+var _regeneratorRuntime = require("babel-runtime/regenerator");
 
-var _Object$keys = require("babel-runtime/core-js/object/keys").default;
+var _Object$keys = require("babel-runtime/core-js/object/keys");
 
 var _marked =
 /*#__PURE__*/
diff --git a/packages/babel-plugin-transform-runtime/src/index.js b/packages/babel-plugin-transform-runtime/src/index.js
index fff182e7a3..ed830e7b8d 100644
--- a/packages/babel-plugin-transform-runtime/src/index.js
+++ b/packages/babel-plugin-transform-runtime/src/index.js
@@ -63,7 +63,7 @@ export default function({ types: t }) {
           cached = t.cloneDeep(cached);
         } else {
           cached = addDefault(file.path, source, {
-            importedInterop: "compiled",
+            importedInterop: "uncompiled",
             nameHint,
             blockHoist,
           });
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/aliased-constructors/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/aliased-constructors/expected.js
index e9af3f9463..d8b89dcd68 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/aliased-constructors/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/aliased-constructors/expected.js
@@ -1,8 +1,8 @@
-var _Map = require("babel-runtime/core-js/map").default;
+var _Map = require("babel-runtime/core-js/map");
 
-var _Symbol = require("babel-runtime/core-js/symbol").default;
+var _Symbol = require("babel-runtime/core-js/symbol");
 
-var _Promise = require("babel-runtime/core-js/promise").default;
+var _Promise = require("babel-runtime/core-js/promise");
 
 obj.constructor === Object;
 obj.constructor === _Promise;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/catch-all/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/catch-all/expected.js
index dfe1f85728..df0e29ed23 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/catch-all/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/catch-all/expected.js
@@ -1,3 +1,3 @@
-var _Promise = require("babel-runtime/core-js/promise").default;
+var _Promise = require("babel-runtime/core-js/promise");
 
 _Promise.resolve;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/class/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/class/expected.js
index 62f7026093..f9d5e22905 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/class/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/class/expected.js
@@ -1,4 +1,4 @@
-var _classCallCheck = require("babel-runtime/helpers/classCallCheck").default;
+var _classCallCheck = require("babel-runtime/helpers/classCallCheck");
 
 let Foo = function Foo() {
   _classCallCheck(this, Foo);
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/es6-for-of/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/es6-for-of/expected.js
index 2b6d04b822..df86703577 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/es6-for-of/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/es6-for-of/expected.js
@@ -1,4 +1,4 @@
-var _getIterator = require("babel-runtime/core-js/get-iterator").default;
+var _getIterator = require("babel-runtime/core-js/get-iterator");
 
 var _iteratorNormalCompletion = true;
 var _didIteratorError = false;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/expected.js
index 853c42e84b..a49ec5c3fb 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/expected.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var _interopRequireDefault = require("babel-runtime/helpers/interopRequireDefault").default;
+var _interopRequireDefault = require("babel-runtime/helpers/interopRequireDefault");
 
 var _classCallCheck2 = _interopRequireDefault(require("babel-runtime/helpers/classCallCheck"));
 
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules/expected.js
index 742c943e04..76f4b638cc 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules/expected.js
@@ -1,10 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("babel-runtime/helpers/interopRequireDefault").default;
+var _interopRequireDefault = require("babel-runtime/helpers/interopRequireDefault");
 
-var _Object$defineProperty = require("babel-runtime/core-js/object/define-property").default;
+var _Object$defineProperty = require("babel-runtime/core-js/object/define-property");
 
-var _Object$keys = require("babel-runtime/core-js/object/keys").default;
+var _Object$keys = require("babel-runtime/core-js/object/keys");
 
 Object.defineProperty(exports, "__esModule", {
   value: true
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/regenerator-runtime/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/regenerator-runtime/expected.js
index af1647cc2e..7a950eeb9e 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/regenerator-runtime/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/regenerator-runtime/expected.js
@@ -1,4 +1,4 @@
-var _regeneratorRuntime = require("babel-runtime/regenerator").default;
+var _regeneratorRuntime = require("babel-runtime/regenerator");
 
 void
 /*#__PURE__*/
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/symbol-iterator-in/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/symbol-iterator-in/expected.js
index c426027195..3f88e54f37 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/symbol-iterator-in/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/symbol-iterator-in/expected.js
@@ -1,3 +1,3 @@
-var _isIterable = require("babel-runtime/core-js/is-iterable").default;
+var _isIterable = require("babel-runtime/core-js/is-iterable");
 
 _isIterable(Object(arr));
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/symbol-iterator/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/symbol-iterator/expected.js
index 0d5b32855c..938c68f556 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/symbol-iterator/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/symbol-iterator/expected.js
@@ -1,3 +1,3 @@
-var _Symbol$iterator = require("babel-runtime/core-js/symbol/iterator").default;
+var _Symbol$iterator = require("babel-runtime/core-js/symbol/iterator");
 
 _Symbol$iterator;
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useBuiltIns-useESModules/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useBuiltIns-useESModules/expected.js
index 06770b5e0d..b36e987aaf 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useBuiltIns-useESModules/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useBuiltIns-useESModules/expected.js
@@ -1,8 +1,8 @@
-var _classCallCheck = require("babel-runtime/helpers/builtin/es6/classCallCheck").default;
+var _classCallCheck = require("babel-runtime/helpers/builtin/es6/classCallCheck");
 
-var _possibleConstructorReturn = require("babel-runtime/helpers/builtin/es6/possibleConstructorReturn").default;
+var _possibleConstructorReturn = require("babel-runtime/helpers/builtin/es6/possibleConstructorReturn");
 
-var _inherits = require("babel-runtime/helpers/builtin/es6/inherits").default;
+var _inherits = require("babel-runtime/helpers/builtin/es6/inherits");
 
 let Foo =
 /*#__PURE__*/
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useBuiltIns/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useBuiltIns/expected.js
index cfdbd19017..b8667cfcb5 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useBuiltIns/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useBuiltIns/expected.js
@@ -1,8 +1,8 @@
-var _classCallCheck = require("babel-runtime/helpers/builtin/classCallCheck").default;
+var _classCallCheck = require("babel-runtime/helpers/builtin/classCallCheck");
 
-var _possibleConstructorReturn = require("babel-runtime/helpers/builtin/possibleConstructorReturn").default;
+var _possibleConstructorReturn = require("babel-runtime/helpers/builtin/possibleConstructorReturn");
 
-var _inherits = require("babel-runtime/helpers/builtin/inherits").default;
+var _inherits = require("babel-runtime/helpers/builtin/inherits");
 
 let Foo =
 /*#__PURE__*/
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules/expected.js
index 3a7695f281..b12682a0e3 100644
--- a/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules/expected.js
+++ b/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules/expected.js
@@ -1,10 +1,10 @@
-var _Object$getPrototypeOf = require("babel-runtime/core-js/object/get-prototype-of").default;
+var _Object$getPrototypeOf = require("babel-runtime/core-js/object/get-prototype-of");
 
-var _classCallCheck = require("babel-runtime/helpers/es6/classCallCheck").default;
+var _classCallCheck = require("babel-runtime/helpers/es6/classCallCheck");
 
-var _possibleConstructorReturn = require("babel-runtime/helpers/es6/possibleConstructorReturn").default;
+var _possibleConstructorReturn = require("babel-runtime/helpers/es6/possibleConstructorReturn");
 
-var _inherits = require("babel-runtime/helpers/es6/inherits").default;
+var _inherits = require("babel-runtime/helpers/es6/inherits");
 
 let Foo =
 /*#__PURE__*/
diff --git a/packages/babel-runtime/core-js.js b/packages/babel-runtime/core-js.js
index 7d5664380a..709f7e3252 100644
--- a/packages/babel-runtime/core-js.js
+++ b/packages/babel-runtime/core-js.js
@@ -1,4 +1 @@
-module.exports = {
-  "default": require("core-js/library"),
-  __esModule: true
-};
+module.exports = require("core-js/library");
diff --git a/packages/babel-runtime/core-js/map.js b/packages/babel-runtime/core-js/map.js
index ed02186fe6..7dd2ac72c6 100644
--- a/packages/babel-runtime/core-js/map.js
+++ b/packages/babel-runtime/core-js/map.js
@@ -1 +1 @@
-module.exports = { "default": require("core-js/library/fn/map"), __esModule: true };
\ No newline at end of file
+module.exports = require("core-js/library/fn/map");
\ No newline at end of file
diff --git a/packages/babel-runtime/helpers/builtin/toArray.js b/packages/babel-runtime/helpers/builtin/toArray.js
index 96df336ff8..97107ebfeb 100644
--- a/packages/babel-runtime/helpers/builtin/toArray.js
+++ b/packages/babel-runtime/helpers/builtin/toArray.js
@@ -1,6 +1,5 @@
-exports.__esModule = true;
-exports.default = _toArray;
-
 function _toArray(arr) {
   return Array.isArray(arr) ? arr : Array.from(arr);
-}
\ No newline at end of file
+}
+
+module.exports = _toArray;
\ No newline at end of file
diff --git a/packages/babel-runtime/helpers/toArray.js b/packages/babel-runtime/helpers/toArray.js
index 8b61c3a119..6709feb464 100644
--- a/packages/babel-runtime/helpers/toArray.js
+++ b/packages/babel-runtime/helpers/toArray.js
@@ -1,10 +1,7 @@
-exports.__esModule = true;
-exports.default = _toArray;
-
-var _from = _interopRequireDefault(require("../core-js/array/from"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _Array$from = require("../core-js/array/from");
 
 function _toArray(arr) {
-  return Array.isArray(arr) ? arr : (0, _from.default)(arr);
-}
\ No newline at end of file
+  return Array.isArray(arr) ? arr : _Array$from(arr);
+}
+
+module.exports = _toArray;
\ No newline at end of file
diff --git a/packages/babel-runtime/scripts/build-dist.js b/packages/babel-runtime/scripts/build-dist.js
index f581bdb4a3..2fb365e94c 100644
--- a/packages/babel-runtime/scripts/build-dist.js
+++ b/packages/babel-runtime/scripts/build-dist.js
@@ -33,7 +33,7 @@ function relative(filename) {
 }
 
 function defaultify(name) {
-  return `module.exports = { "default": ${name}, __esModule: true };`;
+  return `module.exports = ${name};`;
 }
 
 function writeRootFile(filename, content) {
@@ -57,14 +57,6 @@ function makeTransformOpts(modules, useBuiltIns) {
       ],
     ],
   };
-  if (modules === "commonjs") {
-    opts.plugins.push([
-      require("../../babel-plugin-transform-es2015-modules-commonjs"),
-      { loose: true, strictMode: false },
-    ]);
-  } else if (modules !== false) {
-    throw new Error("Unsupported module type");
-  }
   return opts;
 }
 
@@ -104,8 +96,13 @@ function buildRuntimeRewritePlugin(relativePath, helperName) {
 }
 
 function buildHelper(helperName, modules, useBuiltIns) {
-  const tree = t.program(helpers.get(helperName).nodes, [], "module");
+  const id =
+    modules === "commonjs"
+      ? t.memberExpression(t.identifier("module"), t.identifier("exports"))
+      : null;
+  const sourceType = modules === "commonjs" ? "script" : "module";
 
+  const tree = t.program(helpers.get(helperName, id).nodes, [], sourceType);
   const transformOpts = makeTransformOpts(modules, useBuiltIns);
 
   const relative = useBuiltIns ? "../.." : "..";