From e06aac47831bdf609d72e9234c05a87e645b1f13 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Sat, 7 Feb 2015 19:40:49 +1100
Subject: [PATCH] Revert "make export { foo as default }; trigger common
 interop"

This reverts commit 07c7b5b419a99802e2949b72c5cbf6ee4010929a.
---
 lib/6to5/transformation/modules/_default.js |  2 +-
 lib/6to5/transformation/modules/common.js   | 11 -----------
 lib/6to5/types/index.js                     |  2 +-
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/lib/6to5/transformation/modules/_default.js b/lib/6to5/transformation/modules/_default.js
index 4d3f6d3359..908180f1c3 100644
--- a/lib/6to5/transformation/modules/_default.js
+++ b/lib/6to5/transformation/modules/_default.js
@@ -27,7 +27,7 @@ function DefaultFormatter(file) {
 }
 
 DefaultFormatter.prototype.doDefaultExportInterop = function (node) {
-  return t.isSpecifierDefault(node) && !this.noInteropRequireExport && !this.hasNonDefaultExports;
+  return node.default && !this.noInteropRequireExport && !this.hasNonDefaultExports;
 };
 
 DefaultFormatter.prototype.bumpImportOccurences = function (node) {
diff --git a/lib/6to5/transformation/modules/common.js b/lib/6to5/transformation/modules/common.js
index 2441385fe8..f2ce247b56 100644
--- a/lib/6to5/transformation/modules/common.js
+++ b/lib/6to5/transformation/modules/common.js
@@ -64,17 +64,6 @@ CommonJSFormatter.prototype.importDeclaration = function (node, nodes) {
   }, true));
 };
 
-CommonJSFormatter.prototype.exportSpecifier = function (specifier, node, nodes) {
-  if (this.doDefaultExportInterop(node)) {
-    nodes.push(util.template("exports-default-assign", {
-      VALUE: t.getSpecifierId(specifier)
-    }, true));
-    return;
-  }
-
-  DefaultFormatter.prototype.exportSpecifier.apply(this, arguments);
-};
-
 CommonJSFormatter.prototype.exportDeclaration = function (node, nodes) {
   if (this.doDefaultExportInterop(node)) {
     var declar = node.declaration;
diff --git a/lib/6to5/types/index.js b/lib/6to5/types/index.js
index 1491d7cbb4..52545f04d6 100644
--- a/lib/6to5/types/index.js
+++ b/lib/6to5/types/index.js
@@ -760,7 +760,7 @@ t.getSpecifierId = function (specifier) {
  */
 
 t.isSpecifierDefault = function (specifier) {
-  return specifier.default || t.isIdentifier(specifier.id, { name: "default" });
+  return specifier.default || t.isIdentifier(specifier.id) && specifier.id.name === "default";
 };
 
 toFastProperties(t);