diff --git a/eslint/babel-eslint-parser/index.js b/eslint/babel-eslint-parser/index.js
index 355fc5d34e..efbac4bf3b 100644
--- a/eslint/babel-eslint-parser/index.js
+++ b/eslint/babel-eslint-parser/index.js
@@ -363,8 +363,6 @@ function monkeypatch() {
 }
 
 exports.attachComments = function (ast, comments, tokens) {
-  estraverse.attachComments(ast, comments, tokens);
-
   if (comments.length) {
     var firstComment = comments[0];
     var lastComment = comments[comments.length - 1];
@@ -456,7 +454,7 @@ exports.parse = function (code) {
     }
   }
   ast.comments = comments;
-  exports.attachComments(ast, comments, tokens);
+  exports.attachComments(ast, comments, ast.tokens);
 
   // transform esprima and acorn divergent nodes
   acornToEsprima.toAST(ast);