diff --git a/Podfile b/Podfile
index da41b68d3..fee7e98bc 100644
--- a/Podfile
+++ b/Podfile
@@ -45,8 +45,7 @@ def shared_pods
   pod 'SocketRocket', :git => 'https://github.com/signalapp/SocketRocket.git', branch: 'mkirk/handle-sec-err', inhibit_warnings: true
 
   # Forked for compatibily with the ShareExtension, changes have an open PR, but have not been merged.
-  # pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'signal-release'
-  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'mkirk/sqlcipher4'
+  pod 'YapDatabase/SQLCipher', :git => 'https://github.com/signalapp/YapDatabase.git', branch: 'signal-release'
   # pod 'YapDatabase/SQLCipher', path: '../YapDatabase'
 
   # Forked to incorporate our self-built binary artifact.
diff --git a/Podfile.lock b/Podfile.lock
index 89ece44d9..1af9b28d8 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -208,7 +208,7 @@ DEPENDENCIES:
   - SocketRocket (from `https://github.com/signalapp/SocketRocket.git`, branch `mkirk/handle-sec-err`)
   - SQLCipher (>= 4.0.1)
   - SSZipArchive
-  - YapDatabase/SQLCipher (from `https://github.com/signalapp/YapDatabase.git`, branch `mkirk/sqlcipher4`)
+  - YapDatabase/SQLCipher (from `https://github.com/signalapp/YapDatabase.git`, branch `signal-release`)
   - YYImage
 
 SPEC REPOS:
@@ -248,7 +248,7 @@ EXTERNAL SOURCES:
     :branch: mkirk/handle-sec-err
     :git: https://github.com/signalapp/SocketRocket.git
   YapDatabase:
-    :branch: mkirk/sqlcipher4
+    :branch: signal-release
     :git: https://github.com/signalapp/YapDatabase.git
 
 CHECKOUT OPTIONS:
@@ -277,7 +277,7 @@ CHECKOUT OPTIONS:
     :commit: 9f9563a83cd8960503074aa8de72206f83fb7a69
     :git: https://github.com/signalapp/SocketRocket.git
   YapDatabase:
-    :commit: 7ee35e1a42c2c075db005dc0278e57913a00b31a
+    :commit: 9f7d82395c534107928990950720fc49073c7b47
     :git: https://github.com/signalapp/YapDatabase.git
 
 SPEC CHECKSUMS:
@@ -303,6 +303,6 @@ SPEC CHECKSUMS:
   YapDatabase: b418a4baa6906e8028748938f9159807fd039af4
   YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
 
-PODFILE CHECKSUM: 627f656b9187deaf83ab4cfb12fe2a4a0326aee3
+PODFILE CHECKSUM: 7ccd091c65f353c7fcc3021a13b557a576d48509
 
 COCOAPODS: 1.5.3
diff --git a/Pods b/Pods
index 94b55b6ec..2b8dd5789 160000
--- a/Pods
+++ b/Pods
@@ -1 +1 @@
-Subproject commit 94b55b6ec723b03927626c2cc0dfbafb33f3ef13
+Subproject commit 2b8dd57892298048828b26255f9f753fdd1235a4