diff --git a/eslint/babel-eslint-parser/index.js b/eslint/babel-eslint-parser/index.js
index cf42ffb3c4..47980470f4 100644
--- a/eslint/babel-eslint-parser/index.js
+++ b/eslint/babel-eslint-parser/index.js
@@ -47,17 +47,23 @@ function monkeypatch() {
     estraverseRelative = createModule(esrecurseLoc);
   } catch (err) {}
 
+  // contains all the instances of estraverse so we can modify them if necessary
+  var estraverses = [];
+
   // monkeypatch estraverse
   estraverse = estraverseRelative.require("estraverse");
+  estraverses.push(estraverse);
   assign(estraverse.VisitorKeys, t.VISITOR_KEYS);
 
   // monkeypatch estraverse-fb
   var estraverseFb = eslintMod.require("estraverse-fb");
+  estraverses.push(estraverseFb);
   assign(estraverseFb.VisitorKeys, t.VISITOR_KEYS);
 
   // ESLint v1.9.0 uses estraverse directly to work around https://github.com/npm/npm/issues/9663
   var estraverseOfEslint = eslintMod.require("estraverse");
   if (estraverseOfEslint !== estraverseFb) {
+    estraverses.push(estraverseOfEslint);
     assign(estraverseOfEslint.VisitorKeys, t.VISITOR_KEYS);
   }
 
@@ -279,7 +285,18 @@ function monkeypatch() {
         }
       }
     }
+    // set ArrayPattern/ObjectPattern visitor keys back to their original. otherwise
+    // escope will traverse into them and include the identifiers within as declarations
+    estraverses.forEach(function (estraverse) {
+      estraverse.VisitorKeys.ObjectPattern = ["properties"];
+      estraverse.VisitorKeys.ArrayPattern = ["elements"];
+    });
     visitFunction.call(this, node);
+    // set them back to normal...
+    estraverses.forEach(function (estraverse) {
+      estraverse.VisitorKeys.ObjectPattern = t.VISITOR_KEYS.ObjectPattern;
+      estraverse.VisitorKeys.ArrayPattern = t.VISITOR_KEYS.ArrayPattern;
+    });
     if (typeParamScope) {
       this.close(node);
     }
diff --git a/eslint/babel-eslint-parser/test/non-regression.js b/eslint/babel-eslint-parser/test/non-regression.js
index c8dcf93da2..e1f18afa08 100644
--- a/eslint/babel-eslint-parser/test/non-regression.js
+++ b/eslint/babel-eslint-parser/test/non-regression.js
@@ -1340,6 +1340,19 @@ describe("verify", function () {
     );
   });
 
+  it("fixes issues with flow types and ObjectPattern", function () {
+    verifyAndAssertMessages([
+        "import type Foo from 'bar';",
+        "export default class Foobar {",
+        "  foo({ bar }: Foo) { bar; }",
+        "  bar({ foo }: Foo) { foo; }",
+        "}"
+      ].join("\n"),
+      { "no-unused-vars": 1 },
+      []
+    );
+  });
+
   // it("regex with es6 unicodeCodePointEscapes", function () {
   //   verifyAndAssertMessages(
   //     "string.replace(/[\u{0000A0}-\u{10FFFF}<>\&]/gmiu, (char) => `&#x${char.codePointAt(0).toString(16)};`);",