diff --git a/.eslintrc.js b/.eslintrc.js
index 18ea82280..898df4c56 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -57,17 +57,14 @@ module.exports = {
     "callback-return": 0,
     "camelcase": 0,
     "comma-dangle": [2, "never"],
-    "comma-style": 2,
     "consistent-this": [2, "use-bind"],
     "constructor-super": 2,
     "curly": [2, "all"],
     "default-case": 0,
     "dot-location": [2, "property"],
-    "dot-notation": 2,
     "eqeqeq": 2,
     "func-names": 0,
     "func-style": 0,
-    "generator-star-spacing": [2, {"before": false, "after": false}],
     "global-require": 0,
     "guard-for-in": 2,
     "handle-callback-err": 2,
@@ -97,24 +94,17 @@ module.exports = {
     "newline-before-return": 0,
     "newline-per-chained-call": [2, {"ignoreChainWithDepth": 3}],
     "no-alert": 2,
-    "no-array-constructor": 2,
     "no-bitwise": 0,
-    "no-caller": 2,
     "no-case-declarations": 2,
     "no-catch-shadow": 2,
-    "no-class-assign": 2,
     "no-confusing-arrow": [2, {"allowParens": true}],
     "no-console": 1,
-    "no-const-assign": 2,
     "no-constant-condition": 2,
     "no-continue": 0,
-    "no-control-regex": 2,
     "no-div-regex": 2,
-    "no-dupe-class-members": 2,
     "no-duplicate-imports": 2,
     "no-empty-function": 0,
     "no-eq-null": 2,
-    "no-eval": 2,
     "no-extend-native": 2,
     "no-extra-label": 2,
     "no-extra-parens": 0,
@@ -122,7 +112,6 @@ module.exports = {
     "no-floating-decimal": 2,
     "no-implicit-coercion": [2, {"allow": ["!!"]}],
     "no-implicit-globals": 2,
-    "no-implied-eval": 2,
     "no-inline-comments": 0,
     "no-inner-declarations": 2,
     "no-invalid-this": 0,
@@ -139,7 +128,6 @@ module.exports = {
     "no-new-func": 2,
     "no-new-require": 2,
     "no-new-symbol": 2,
-    "no-new-wrappers": 2,
     "no-octal-escape": 2,
     "no-param-reassign": 2,
     "no-path-concat": 2,
@@ -158,7 +146,6 @@ module.exports = {
     "no-shadow": 2,
     "no-spaced-func": 2,
     "no-sync": 0,
-    "no-tabs": 2,
     "no-template-curly-in-string": 2,
     "no-ternary": 0,
     "no-this-before-super": 2,
@@ -167,7 +154,6 @@ module.exports = {
     "no-undefined": 0,
     "no-underscore-dangle": 0,
     "no-unmodified-loop-condition": 2,
-    "no-unneeded-ternary": 2,
     "no-unused-expressions": 2,
     "no-unused-labels": 2,
     "no-use-before-define": 2,
@@ -178,7 +164,6 @@ module.exports = {
     "no-var": 2,
     "no-void": 2,
     "no-warning-comments": 0, // TODO: Change to `1`?
-    "no-whitespace-before-property": 2,
     "object-curly-newline": [2, {"multiline": true}],
     "object-curly-spacing": [2, "never"],
     "object-property-newline": [2, {"allowMultiplePropertiesPerLine": true}],
@@ -197,16 +182,9 @@ module.exports = {
     "radix": [2, "always"],
     "require-jsdoc": 0,
     "require-yield": 2,
-    "semi": [2, "always"],
     "semi-spacing": [2, {"before": false, "after": true}],
     "sort-imports": [2, {"ignoreCase": true}],
     "sort-vars": 2,
-    // Override this until eslint-plugin-mozilla gets updated.
-    "space-before-function-paren": ["error", {
-      "anonymous": "never",
-      "asyncArrow": "always",
-      "named": "never"
-    }],
     "space-in-parens": [2, "never"],
     "strict": 0,
     "template-curly-spacing": [2, "never"],
diff --git a/bin/test-merges.js b/bin/test-merges.js
index 4e023309f..188d77368 100644
--- a/bin/test-merges.js
+++ b/bin/test-merges.js
@@ -319,7 +319,7 @@ function main() {
       return;
     }
 
-    function*executePush() {
+    function* executePush() {
       for (let pr of data.items) {
         yield pushPR(pr);
       }