--- a/mailnews/addrbook/modules/AddrBookDirectory.jsm
+++ b/mailnews/addrbook/modules/AddrBookDirectory.jsm
@@ -8,17 +8,16 @@ const { XPCOMUtils } = ChromeUtils.impor
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   AddrBookCard: "resource:///modules/AddrBookCard.jsm",
   AddrBookMailingList: "resource:///modules/AddrBookMailingList.jsm",
   compareAddressBooks: "resource:///modules/AddrBookUtils.jsm",
   FileUtils: "resource://gre/modules/FileUtils.jsm",
-  fixIterator: "resource:///modules/iteratorUtils.jsm",
   newUID: "resource:///modules/AddrBookUtils.jsm",
   Services: "resource://gre/modules/Services.jsm",
   SimpleEnumerator: "resource:///modules/AddrBookUtils.jsm",
 });
 
 var log = console.createInstance({
   prefix: "mail.addr_book",
   maxLogLevel: "Warn",
@@ -314,17 +313,17 @@ class AddrBookDirectory {
       insertStatement.execute();
       insertStatement.reset();
 
       if (cachedCard) {
         cachedCard.set(name, value);
       }
     };
 
-    for (let { name, value } of fixIterator(card.properties, Ci.nsIProperty)) {
+    for (let { name, value } of card.properties) {
       if (
         name != "LastModifiedDate" &&
         value !== null &&
         value !== undefined &&
         value !== ""
       ) {
         saveProp(name, value);
       }
@@ -380,20 +379,17 @@ class AddrBookDirectory {
       usedUIDs.add(uid);
 
       let cachedCard;
       if (this.hasOwnProperty("_cards")) {
         cachedCard = new Map();
         this._cards.set(uid, cachedCard);
       }
 
-      for (let { name, value } of fixIterator(
-        card.properties,
-        Ci.nsIProperty
-      )) {
+      for (let { name, value } of card.properties) {
         if (
           [
             "DbRowID",
             "LowercasePrimaryEmail",
             "LowercaseSecondEmail",
             "RecordKey",
             "UID",
           ].includes(name)
@@ -751,17 +747,17 @@ class AddrBookDirectory {
         "Directory is read-only",
         Cr.NS_ERROR_FAILURE
       );
     }
 
     let oldProperties = this._loadCardProperties(card.UID);
     let changedProperties = new Set(oldProperties.keys());
 
-    for (let { name, value } of fixIterator(card.properties, Ci.nsIProperty)) {
+    for (let { name, value } of card.properties) {
       if (!oldProperties.has(name) && ![null, undefined, ""].includes(value)) {
         changedProperties.add(name);
       } else if (oldProperties.get(name) == value) {
         changedProperties.delete(name);
       }
     }
     changedProperties.delete("LastModifiedDate");
 
@@ -842,17 +838,17 @@ class AddrBookDirectory {
     let newCard = new AddrBookCard();
     newCard.directoryUID = this.UID;
     newCard._uid = needToCopyCard ? newUID() : card.UID;
 
     if (this.hasOwnProperty("_cards")) {
       this._cards.set(newCard._uid, new Map());
     }
 
-    for (let { name, value } of fixIterator(card.properties, Ci.nsIProperty)) {
+    for (let { name, value } of card.properties) {
       if (
         [
           "DbRowID",
           "LowercasePrimaryEmail",
           "LowercaseSecondEmail",
           "RecordKey",
           "UID",
         ].includes(name)