--- a/security/manager/ssl/nsIPK11Token.idl
+++ b/security/manager/ssl/nsIPK11Token.idl
@@ -72,11 +72,9 @@ interface nsIPK11Token : nsISupports
    */
   readonly attribute boolean hasPassword;
 
   /*
    * Other attributes
    */
   boolean isHardwareToken();
   boolean needsLogin();
-  boolean isFriendly();
 };
-

--- a/security/manager/ssl/nsISecurityUITelemetry.idl
+++ b/security/manager/ssl/nsISecurityUITelemetry.idl
@@ -41,39 +41,39 @@ const uint32_t WARNING_CONFIRM_POST_TO_I
 //     removed WARNING_CONFIRM_POST_TO_INSECURE_FROM_INSECURE = 11;
 //     removed WARNING_CONFIRM_POST_TO_INSECURE_FROM_INSECURE_CLICK_THROUGH = 12;
 
 /*
  * Phishing / Malware page warnings
  * deprecated: we use the _TOP and _FRAME versions below
  */
 
-const uint32_t WARNING_MALWARE_PAGE = 13;
-const uint32_t WARNING_MALWARE_PAGE_WHY_BLOCKED = 14;
-const uint32_t WARNING_MALWARE_PAGE_GET_ME_OUT_OF_HERE = 15;
-const uint32_t WARNING_MALWARE_PAGE_IGNORE_WARNING = 16;
+//     removed WARNING_MALWARE_PAGE = 13;
+//     removed WARNING_MALWARE_PAGE_WHY_BLOCKED = 14;
+//     removed WARNING_MALWARE_PAGE_GET_ME_OUT_OF_HERE = 15;
+//     removed WARNING_MALWARE_PAGE_IGNORE_WARNING = 16;
 
-const uint32_t WARNING_PHISHING_PAGE = 17;
-const uint32_t WARNING_PHISHING_PAGE_WHY_BLOCKED = 18;
-const uint32_t WARNING_PHISHING_PAGE_GET_ME_OUT_OF_HERE = 19;
-const uint32_t WARNING_PHISHING_PAGE_IGNORE_WARNING = 20;
+//     removed WARNING_PHISHING_PAGE = 17;
+//     removed WARNING_PHISHING_PAGE_WHY_BLOCKED = 18;
+//     removed WARNING_PHISHING_PAGE_GET_ME_OUT_OF_HERE = 19;
+//     removed WARNING_PHISHING_PAGE_IGNORE_WARNING = 20;
 
 /* 
  * SSL Error dialogs
  * deprecated: we use the _TOP versions below
  */
 
-const uint32_t WARNING_BAD_CERT = 21;
-const uint32_t WARNING_BAD_CERT_STS = 22;
-const uint32_t WARNING_BAD_CERT_CLICK_ADD_EXCEPTION = 23;
-const uint32_t WARNING_BAD_CERT_CLICK_VIEW_CERT = 24;
-const uint32_t WARNING_BAD_CERT_DONT_REMEMBER_EXCEPTION = 25;
-const uint32_t WARNING_BAD_CERT_GET_ME_OUT_OF_HERE = 27;
-const uint32_t WARNING_BAD_CERT_UNDERSTAND_RISKS = 28;
-const uint32_t WARNING_BAD_CERT_TECHINICAL_DETAILS = 29;
+//     removed WARNING_BAD_CERT = 21;
+//     removed WARNING_BAD_CERT_STS = 22;
+//     removed WARNING_BAD_CERT_CLICK_ADD_EXCEPTION = 23;
+//     removed WARNING_BAD_CERT_CLICK_VIEW_CERT = 24;
+//     removed WARNING_BAD_CERT_DONT_REMEMBER_EXCEPTION = 25;
+//     removed WARNING_BAD_CERT_GET_ME_OUT_OF_HERE = 27;
+//     removed WARNING_BAD_CERT_UNDERSTAND_RISKS = 28;
+//     removed WARNING_BAD_CERT_TECHINICAL_DETAILS = 29;
 
 /*
  * Note that if we add more possibilities in the warning dialogs,
  * it is a new experiment and we shouldn't reuse these buckets.
  */
 const uint32_t WARNING_BAD_CERT_ADD_EXCEPTION_BASE = 30;
 const uint32_t WARNING_BAD_CERT_ADD_EXCEPTION_FLAG_UNTRUSTED = 1;
 const uint32_t WARNING_BAD_CERT_ADD_EXCEPTION_FLAG_DOMAIN = 2;

--- a/security/manager/ssl/nsPK11TokenDB.cpp
+++ b/security/manager/ssl/nsPK11TokenDB.cpp
@@ -398,30 +398,16 @@ nsPK11Token::NeedsLogin(bool* _retval)
   if (isAlreadyShutDown())
     return NS_ERROR_NOT_AVAILABLE;
 
   *_retval = PK11_NeedLogin(mSlot.get());
 
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsPK11Token::IsFriendly(bool* _retval)
-{
-  NS_ENSURE_ARG_POINTER(_retval);
-
-  nsNSSShutDownPreventionLock locker;
-  if (isAlreadyShutDown())
-    return NS_ERROR_NOT_AVAILABLE;
-
-  *_retval = PK11_IsFriendly(mSlot.get());
-
-  return NS_OK;
-}
-
 /*=========================================================*/
 
 NS_IMPL_ISUPPORTS(nsPK11TokenDB, nsIPK11TokenDB)
 
 nsPK11TokenDB::nsPK11TokenDB()
 {
 }
 

--- a/security/manager/ssl/tests/unit/test_pkcs11_token.js
+++ b/security/manager/ssl/tests/unit/test_pkcs11_token.js
@@ -111,13 +111,11 @@ function run_test() {
   ok(token.isLoggedIn(),
      "Token should be logged into after initializing password again");
   token.logoutSimple();
   ok(!token.isLoggedIn(),
      "Token should be logged out after calling logoutSimple()");
 
   ok(!token.isHardwareToken(),
      "The internal token should not be considered a hardware token");
-  ok(token.isFriendly(),
-     "The internal token should always be considered friendly");
   ok(token.needsLogin(),
      "The internal token should always need authentication");
 }