diff --git a/js/background.js b/js/background.js
index c03ea2562..18a4c6d4e 100644
--- a/js/background.js
+++ b/js/background.js
@@ -105,7 +105,6 @@
       BackboneMessageCollection: Whisper.MessageCollection,
       count: NUM_MESSAGE_UPGRADES_PER_IDLE,
       upgradeMessageSchema,
-      wrapDeferred,
     });
     console.log('Upgrade message schema:', results);
 
diff --git a/js/modules/messages_data_migrator.js b/js/modules/messages_data_migrator.js
index 9ccb8c98a..2df16daff 100644
--- a/js/modules/messages_data_migrator.js
+++ b/js/modules/messages_data_migrator.js
@@ -1,6 +1,8 @@
 const isNumber = require('lodash/isNumber');
 const isFunction = require('lodash/isFunction');
+
 const Message = require('./types/message');
+const { deferredToPromise } = require('./deferred_to_promise');
 
 
 exports.processNext = async ({
@@ -8,7 +10,6 @@ exports.processNext = async ({
   BackboneMessageCollection,
   count,
   upgradeMessageSchema,
-  wrapDeferred,
 } = {}) => {
   if (!isFunction(BackboneMessage)) {
     throw new TypeError('`BackboneMessage` (Whisper.Message) constructor is required');
@@ -27,10 +28,6 @@ exports.processNext = async ({
     throw new TypeError('`upgradeMessageSchema` is required');
   }
 
-  if (!isFunction(wrapDeferred)) {
-    throw new TypeError('`wrapDeferred` is required');
-  }
-
   const startTime = Date.now();
 
   const startFetchTime = Date.now();
@@ -44,7 +41,7 @@ exports.processNext = async ({
   const upgradeDuration = Date.now() - startUpgradeTime;
 
   const startSaveTime = Date.now();
-  const saveMessage = _saveMessage({ BackboneMessage, wrapDeferred });
+  const saveMessage = _saveMessage({ BackboneMessage });
   await Promise.all(upgradedMessages.map(saveMessage));
   const saveDuration = Date.now() - startSaveTime;
 
@@ -61,9 +58,9 @@ exports.processNext = async ({
   };
 };
 
-const _saveMessage = ({ BackboneMessage, wrapDeferred } = {}) => (message) => {
+const _saveMessage = ({ BackboneMessage } = {}) => (message) => {
   const backboneMessage = new BackboneMessage(message);
-  return wrapDeferred(backboneMessage.save());
+  return deferredToPromise(backboneMessage.save());
 };
 
 const _fetchMessagesRequiringSchemaUpgrade =