diff --git a/AsyncDisplayKit/TextKit/ASTextKitContext.mm b/AsyncDisplayKit/TextKit/ASTextKitContext.mm
index 73f4b92e94..7410ed9f45 100755
--- a/AsyncDisplayKit/TextKit/ASTextKitContext.mm
+++ b/AsyncDisplayKit/TextKit/ASTextKitContext.mm
@@ -9,14 +9,14 @@
 //
 
 #import "ASTextKitContext.h"
-#import "ASThread.h"
-
 #import "ASLayoutManager.h"
 
+#import <mutex>
+
 @implementation ASTextKitContext
 {
   // All TextKit operations (even non-mutative ones) must be executed serially.
-  ASDN::Mutex _textKitMutex;
+  std::mutex _textKitMutex;
 
   NSLayoutManager *_layoutManager;
   NSTextStorage *_textStorage;
@@ -35,8 +35,8 @@
 {
   if (self = [super init]) {
     // Concurrently initialising TextKit components crashes (rdar://18448377) so we use a global lock.
-    static ASDN::Mutex __staticMutex;
-    ASDN::MutexLocker l(__staticMutex);
+    static std::mutex __static_mutex;
+    std::lock_guard<std::mutex> l(__static_mutex);
     // Create the TextKit component stack with our default configuration.
     if (textStorageCreationBlock) {
       _textStorage = textStorageCreationBlock(attributedString);
@@ -60,13 +60,13 @@
 
 - (CGSize)constrainedSize
 {
-  ASDN::MutexLocker l(_textKitMutex);
+  std::lock_guard<std::mutex> l(_textKitMutex);
   return _textContainer.size;
 }
 
 - (void)setConstrainedSize:(CGSize)constrainedSize
 {
-  ASDN::MutexLocker l(_textKitMutex);
+  std::lock_guard<std::mutex> l(_textKitMutex);
   _textContainer.size = constrainedSize;
 }
 
@@ -74,7 +74,7 @@
                                                           NSTextStorage *,
                                                           NSTextContainer *))block
 {
-  ASDN::MutexLocker l(_textKitMutex);
+  std::lock_guard<std::mutex> l(_textKitMutex);
   block(_layoutManager, _textStorage, _textContainer);
 }