diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index 871b69e2e578..75f565657287 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -1183,3 +1183,8 @@ textsecure.MessageReceiver = function MessageReceiverWrapper(
 textsecure.MessageReceiver.prototype = {
   constructor: textsecure.MessageReceiver,
 };
+
+textsecure.MessageReceiver.stringToArrayBuffer =
+  MessageReceiver.stringToArrayBuffer;
+textsecure.MessageReceiver.arrayBufferToString =
+  MessageReceiver.arrayBufferToString;
diff --git a/main.js b/main.js
index 6d7c11fb90b9..1b025e3c6ceb 100644
--- a/main.js
+++ b/main.js
@@ -26,7 +26,7 @@ const packageJson = require('./package.json');
 
 const sql = require('./app/sql');
 const sqlChannels = require('./app/sql_channel');
-const attachments = require('./app/attachments');
+// const attachments = require('./app/attachments');
 const attachmentChannel = require('./app/attachment_channel');
 const autoUpdate = require('./app/auto_update');
 const createTrayIcon = require('./app/tray_icon');
@@ -631,12 +631,12 @@ app.on('ready', async () => {
   await sql.initialize({ configDir: userDataPath, key });
   await sqlChannels.initialize({ userConfig });
 
-  const allAttachments = await attachments.getAllAttachments(userDataPath);
-  const orphanedAttachments = await sql.removeKnownAttachments(allAttachments);
-  await attachments.deleteAll({
-    userDataPath,
-    attachments: orphanedAttachments,
-  });
+  // const allAttachments = await attachments.getAllAttachments(userDataPath);
+  // const orphanedAttachments = await sql.removeKnownAttachments(allAttachments);
+  // await attachments.deleteAll({
+  //   userDataPath,
+  //   attachments: orphanedAttachments,
+  // });
 
   ready = true;