diff --git a/Modules/Package.swift b/Modules/Package.swift
index 0ba30dc717f0..a57d443ea779 100644
--- a/Modules/Package.swift
+++ b/Modules/Package.swift
@@ -101,7 +101,6 @@ enum XcodeSupport {
             "WordPressShared",
             "WordPressUI",
             .product(name: "Gridicons", package: "Gridicons-iOS"),
-            .product(name: "NSObject-SafeExpectations", package: "NSObject-SafeExpectations"),
             .product(name: "NSURL+IDN", package: "NSURL-IDN"),
             .product(name: "SVProgressHUD", package: "SVProgressHUD"),
             .product(name: "WordPressKit", package: "WordPressKit-iOS"),
diff --git a/WordPressAuthenticator/Sources/Authenticator/WordPressAuthenticator.swift b/WordPressAuthenticator/Sources/Authenticator/WordPressAuthenticator.swift
index b70995577240..440b487b0b52 100644
--- a/WordPressAuthenticator/Sources/Authenticator/WordPressAuthenticator.swift
+++ b/WordPressAuthenticator/Sources/Authenticator/WordPressAuthenticator.swift
@@ -1,6 +1,5 @@
 import AuthenticationServices
 import NSURL_IDN
-import NSObject_SafeExpectations
 import UIKit
 import WordPressShared
 import WordPressKit
@@ -409,12 +408,12 @@ import WordPressKit
             return false
         }
 
-        guard let authToken = queryDictionary.string(forKey: "token") else {
+        guard let authToken = queryDictionary["token"] as? String else {
             WPAuthenticatorLogError("Magic link error: we couldn't retrieve the authentication token from the sign-in URL.")
             return false
         }
 
-        guard let flowRawValue = queryDictionary.string(forKey: "flow") else {
+        guard let flowRawValue = queryDictionary["flow"] as? String else {
             WPAuthenticatorLogError("Magic link error: we couldn't retrieve the flow from the sign-in URL.")
             return false
         }