diff --git a/eslint/babel-eslint-parser/acorn-to-esprima.js b/eslint/babel-eslint-parser/acorn-to-esprima.js
index 70d07423c5..0241427e34 100644
--- a/eslint/babel-eslint-parser/acorn-to-esprima.js
+++ b/eslint/babel-eslint-parser/acorn-to-esprima.js
@@ -38,12 +38,6 @@ var astTransformVisitor = {
     }
 
     // classes
-    
-    if (t.isClassDeclaration(node)) {
-      return t.variableDeclaration("let", [
-        t.variableDeclarator(node.id, node)
-      ]);
-    }
 
     if (t.isClassProperty(node)) {
       // eslint doesn't like these
@@ -54,7 +48,7 @@ var astTransformVisitor = {
 
     if (t.isJSXIdentifier(node)) {
       if (node.name === "this" && t.isReferenced(node, parent)) {
-        return t.thisExpression();
+        return t.inherits(t.thisExpression(), node);
       } else {
         node.type = "Identifier";
       }