Backed out changeset 6918dea06b7b (bug 1400147) for causing various form autofill heuristics xpcshell failures on Beta 57.

--HG--
extra : rebase_source : 09ae93589d95b20918751d233f80c740c82053f6

browser/extensions/formautofill/FormAutofillHeuristics.jsm

@@ -476,23 +476,6 @@ this.FormAutofillHeuristics = {
     ];
     let regexps = isAutoCompleteOff ? FIELDNAMES_IGNORING_AUTOCOMPLETE_OFF : Object.keys(this.RULES);
 
-    if (!FormAutofillUtils.isAutofillCreditCardsAvailable) {
-      if (isAutoCompleteOff) {
-        if (!this._regexpListOf_CcUnavailable_AcOff) {
-          this._regexpListOf_CcUnavailable_AcOff = regexps.filter(name => !FormAutofillUtils.isCreditCardField(name));
-        }
-        regexps = this._regexpListOf_CcUnavailable_AcOff;
-      } else {
-        if (!this._regexpListOf_CcUnavailable_AcOn) {
-          this._regexpListOf_CcUnavailable_AcOn = regexps.filter(name => !FormAutofillUtils.isCreditCardField(name));
-        }
-        regexps = this._regexpListOf_CcUnavailable_AcOn;
-      }
-    }
-    if (regexps.length == 0) {
-      return null;
-    }
-
     let labelStrings;
     let getElementStrings = {};
     getElementStrings[Symbol.iterator] = function* () {