diff --git a/Signal/Signal-Prefix.pch b/Signal/Signal-Prefix.pch
index 0ce52b02a..27fe91e1d 100644
--- a/Signal/Signal-Prefix.pch
+++ b/Signal/Signal-Prefix.pch
@@ -7,8 +7,8 @@
 #ifdef __OBJC__
     #import <UIKit/UIKit.h>
     #import <Foundation/Foundation.h>
-    #import <CocoaLumberjack/CocoaLumberjack.h>
 
+    @import CocoaLumberjack;
     #ifdef DEBUG
     static const NSUInteger ddLogLevel = DDLogLevelAll;
     #else
diff --git a/SignalServiceKit/src/TSPrefix.h b/SignalServiceKit/src/TSPrefix.h
index 3e0832f60..7a85536a6 100644
--- a/SignalServiceKit/src/TSPrefix.h
+++ b/SignalServiceKit/src/TSPrefix.h
@@ -8,9 +8,10 @@
 #import "OWSAnalytics.h"
 #import "OWSDispatch.h"
 #import "iOSVersions.h"
-#import <CocoaLumberjack/CocoaLumberjack.h>
 #import <Foundation/Foundation.h>
 
+@import CocoaLumberjack;
+
 #ifdef DEBUG
 static const NSUInteger ddLogLevel = DDLogLevelAll;
 #else
diff --git a/SignalServiceKit/src/Util/NSDate+OWS.mm b/SignalServiceKit/src/Util/NSDate+OWS.m
similarity index 74%
rename from SignalServiceKit/src/Util/NSDate+OWS.mm
rename to SignalServiceKit/src/Util/NSDate+OWS.m
index 334dbb944..c9a97243a 100644
--- a/SignalServiceKit/src/Util/NSDate+OWS.mm
+++ b/SignalServiceKit/src/Util/NSDate+OWS.m
@@ -3,7 +3,6 @@
 //
 
 #import "NSDate+OWS.h"
-#import <chrono>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -11,9 +10,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (uint64_t)ows_millisecondTimeStamp
 {
-    uint64_t milliseconds
-        = (uint64_t)(std::chrono::system_clock::now().time_since_epoch() / std::chrono::milliseconds(1));
-    return milliseconds;
+    NSDate *now = [self new];
+    return (uint64_t)(now.timeIntervalSince1970 * 1000);
 }
 
 + (NSDate *)ows_dateWithMillisecondsSince1970:(uint64_t)milliseconds