diff --git a/SignalServiceKit/src/Storage/Database/SDSKeyValueStore.swift b/SignalServiceKit/src/Storage/Database/SDSKeyValueStore.swift
index c601be53fe..ebde7379bf 100644
--- a/SignalServiceKit/src/Storage/Database/SDSKeyValueStore.swift
+++ b/SignalServiceKit/src/Storage/Database/SDSKeyValueStore.swift
@@ -253,6 +253,8 @@ public class SDSKeyValueStore: NSObject {
     // MARK: - Internal Methods
 
     private func read<T>(_ key: String, transaction: SDSAnyReadTransaction) -> T? {
+        return nil
+
         // YDB values are serialized by YDB.
         // GRDB values are serialized to data by this class.
         switch transaction.readTransaction {
diff --git a/SignalServiceKit/src/Util/FeatureFlags.swift b/SignalServiceKit/src/Util/FeatureFlags.swift
index 437a0fc627..7929ac63f8 100644
--- a/SignalServiceKit/src/Util/FeatureFlags.swift
+++ b/SignalServiceKit/src/Util/FeatureFlags.swift
@@ -32,11 +32,11 @@ public class FeatureFlags: NSObject {
 
     @objc
     public static var useGRDB: Bool {
-        if OWSIsDebugBuild() {
-            return true
-        } else {
+//        if OWSIsDebugBuild() {
+//            return true
+//        } else {
             return false
-        }
+//        }
     }
 
     @objc