diff --git a/eslint/babel-eslint-parser/acorn-to-esprima.js b/eslint/babel-eslint-parser/acorn-to-esprima.js
index 8a26e10db5..d8ac33df92 100644
--- a/eslint/babel-eslint-parser/acorn-to-esprima.js
+++ b/eslint/babel-eslint-parser/acorn-to-esprima.js
@@ -175,7 +175,7 @@ function convertTemplateType(tokens) {
 var astTransformVisitor = {
   noScope: true,
   exit: function (node, parent) {
-    if (t.isSpreadProperty(node)) {
+    if (this.isSpreadProperty()) {
       node.type = "Property";
       node.kind = "init";
       node.computed = true;
@@ -183,50 +183,51 @@ var astTransformVisitor = {
       delete node.argument;
     }
 
-    if (t.isTypeCastExpression(node)) {
+    if (this.isTypeCastExpression()) {
       return node.expression;
     }
 
-    if (t.isFlow(node)) {
+    if (this.isFlow()) {
       return this.remove();
     }
 
-    if (t.isRestElement(node)) {
+    if (this.isRestElement()) {
       return node.argument;
     }
 
     // modules
 
-    if (t.isImportDeclaration(node)) {
+    if (this.isImportDeclaration()) {
       delete node.isType;
     }
 
-    if (t.isExportDeclaration(node)) {
-      if (t.isClassExpression(node.declaration)) {
+    if (this.isExportDeclaration(node)) {
+      var declar = this.get("declaration");
+      if (declar.isClassExpression()) {
         node.declaration.type = "ClassDeclaration";
-      } else if (t.isFunctionExpression(node.declaration)) {
+      } else if (declar.isFunctionExpression()) {
         node.declaration.type = "FunctionDeclaration";
       }
     }
 
     // classes
 
-    if (t.isReferencedIdentifier(node, parent, { name: "super" })) {
+    if (this.isReferencedIdentifier({ name: "super" })) {
       return t.inherits(t.thisExpression(), node);
     }
 
-    if (t.isClassProperty(node)) {
+    if (this.isClassProperty()) {
       delete node.key;
     }
 
     // functions
 
-    if (t.isFunction(node)) {
+    if (this.isFunction()) {
       if (node.async) node.generator = true;
       delete node.async;
     }
 
-    if (t.isAwaitExpression(node)) {
+    if (this.isAwaitExpression()) {
       node.type = "YieldExpression";
       node.delegate = node.all;
       delete node.all;
@@ -234,7 +235,7 @@ var astTransformVisitor = {
 
     // template strings
 
-    if (t.isTemplateLiteral(node)) {
+    if (this.isTemplateLiteral()) {
       node.quasis.forEach(function (q) {
         q.range[0] -= 1;
         if (q.tail) {