diff --git a/netwerk/wifi/moz.build b/netwerk/wifi/moz.build
index ad7a1e7ea5cf..13f348c77675 100644
--- a/netwerk/wifi/moz.build
+++ b/netwerk/wifi/moz.build
@@ -24,10 +24,6 @@ if CONFIG["OS_ARCH"] == "Darwin":
     SOURCES += [
         "osx_corewlan.mm",
     ]
-    # osx_corewlan.mm has warnings about scanForNetworksWithParameters,
-    # bssidData and rssi. These are APIs that were removed in 10.7, so we need
-    # to accept the warnings when targeting the newer SDKs.
-    SOURCES["osx_corewlan.mm"].flags += ["-Wno-error=objc-method-access"]
 elif CONFIG["OS_ARCH"] in ("DragonFly", "FreeBSD"):
     UNIFIED_SOURCES += [
         "nsWifiScannerFreeBSD.cpp",
diff --git a/netwerk/wifi/osx_corewlan.mm b/netwerk/wifi/osx_corewlan.mm
index 848907346b14..71ef2c9ec23a 100644
--- a/netwerk/wifi/osx_corewlan.mm
+++ b/netwerk/wifi/osx_corewlan.mm
@@ -37,7 +37,7 @@ nsresult GetAccessPointsFromWLAN(nsCOMArray<nsWifiAccessPoint>& accessPoints) {
       return NS_ERROR_NOT_AVAILABLE;
     }
 
-    id scanResult = [[CWI_class interface] scanForNetworksWithParameters:nil error:nil];
+    id scanResult = [[CWI_class interface] scanForNetworksWithSSID:nil error:nil];
     if (!scanResult) {
       [pool release];
       return NS_ERROR_NOT_AVAILABLE;
@@ -57,7 +57,10 @@ nsresult GetAccessPointsFromWLAN(nsCOMArray<nsWifiAccessPoint>& accessPoints) {
       // is a pain, so we'll use it for as long as it's available.
       unsigned char macData[6] = {0};
       if ([anObject respondsToSelector:@selector(bssidData)]) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-method-access"
         NSData* data = [anObject bssidData];
+#pragma clang diagnostic pop
         if (data) {
           memcpy(macData, [data bytes], 6);
         }
@@ -77,15 +80,7 @@ nsresult GetAccessPointsFromWLAN(nsCOMArray<nsWifiAccessPoint>& accessPoints) {
         }
       }
 
-      // [CWInterface rssiValue] is available on OS X 10.7 and up (and
-      // [CWInterface rssi] is deprecated).
-      int signal = 0;
-      if ([anObject respondsToSelector:@selector(rssiValue)]) {
-        signal = (int)((NSInteger)[anObject rssiValue]);
-      } else {
-        signal = [[anObject rssi] intValue];
-      }
-
+      int signal = (int)((NSInteger)[anObject rssiValue]);
       ap->setMac(macData);
       ap->setSignal(signal);
       ap->setSSID([[anObject ssid] UTF8String], 32);