diff --git a/core/.eslintrc.passing.json b/core/.eslintrc.passing.json
index b013f1445a..55838c2627 100644
--- a/core/.eslintrc.passing.json
+++ b/core/.eslintrc.passing.json
@@ -21,7 +21,6 @@
     "default-case": "off",
     "comma-dangle": "off",
     "camelcase": "off",
-    "array-callback-return": "off",
     "vars-on-top": "off",
     "prefer-rest-params": "off",
     "padded-blocks": "off",
diff --git a/core/misc/form.es6.js b/core/misc/form.es6.js
index 8f535dac8a..8fd0a98720 100644
--- a/core/misc/form.es6.js
+++ b/core/misc/form.es6.js
@@ -236,7 +236,7 @@
       const userInfo = ['name', 'mail', 'homepage'];
       const $forms = $('[data-user-info-from-browser]').once('user-info-from-browser');
       if ($forms.length) {
-        userInfo.map((info) => {
+        userInfo.forEach((info) => {
           const $element = $forms.find(`[name=${info}]`);
           const browserData = localStorage.getItem(`Drupal.visitor.${info}`);
           const emptyOrDefault = ($element.val() === '' || ($element.attr('data-drupal-default-value') === $element.val()));
@@ -246,7 +246,7 @@
         });
       }
       $forms.on('submit', () => {
-        userInfo.map((info) => {
+        userInfo.forEach((info) => {
           const $element = $forms.find(`[name=${info}]`);
           if ($element.length) {
             localStorage.setItem(`Drupal.visitor.${info}`, $element.val());
diff --git a/core/misc/form.js b/core/misc/form.js
index 7e32a31a34..baaba184ee 100644
--- a/core/misc/form.js
+++ b/core/misc/form.js
@@ -105,7 +105,7 @@
       var userInfo = ['name', 'mail', 'homepage'];
       var $forms = $('[data-user-info-from-browser]').once('user-info-from-browser');
       if ($forms.length) {
-        userInfo.map(function (info) {
+        userInfo.forEach(function (info) {
           var $element = $forms.find('[name=' + info + ']');
           var browserData = localStorage.getItem('Drupal.visitor.' + info);
           var emptyOrDefault = $element.val() === '' || $element.attr('data-drupal-default-value') === $element.val();
@@ -115,7 +115,7 @@
         });
       }
       $forms.on('submit', function () {
-        userInfo.map(function (info) {
+        userInfo.forEach(function (info) {
           var $element = $forms.find('[name=' + info + ']');
           if ($element.length) {
             localStorage.setItem('Drupal.visitor.' + info, $element.val());