diff --git a/extensions/cookie/nsICookieManager2.idl b/extensions/cookie/nsICookieManager2.idl
index 8cade7b0151a..47ed6fda6fbc 100644
--- a/extensions/cookie/nsICookieManager2.idl
+++ b/extensions/cookie/nsICookieManager2.idl
@@ -37,8 +37,6 @@
 
 #include "nsICookieManager.idl"
 
-interface nsICookie2;
-
 /** 
  * Additions to the frozen nsICookieManager
  */
@@ -50,41 +48,15 @@ interface nsICookieManager2 : nsICookieManager
    * Add a cookie. nsICookieService is the normal way to do this. This
    * method is something of a backdoor.
    *
-   * @param aDomain
-   *        the host or domain for which the cookie is set
-   * @param aPath
-   *        path within the domain for which the cookie is valid
-   * @param aName
-   *        cookie name
-   * @param aValue
-   *        cookie data
-   * @param aSecure
-   *        true if the cookie should be secure
-   * @param aExpires
-   *        expiration date. 0 means none; a session cookie.
+   * @param aDomain the host or domain for which the cookie is set
+   * @param aPath path within the domain for which the cookie is valid
+   * @param aName cookie name
+   * @param aValue cookie data
+   * @param aSecure true if the cookie should be secure
+   * @param aExpires expiration date. 0 means none; a session cookie.
    */
   [noscript]
-  void add(in AUTF8String aDomain,
-           in AUTF8String aPath,
-           in ACString    aName,
-           in ACString    aValue,
-           in boolean     aSecure,
-           in PRInt32     aExpires);
-
-  /**
-   * Find whether a matching cookie already exists, and how many cookies
-   * a given host has already set. This is useful when e.g. prompting the
-   * user whether to accept a given cookie.
-   *
-   * @param aCookie
-   *        the cookie to look for
-   * @param aCountFromHost
-   *        the number of cookies found whose hosts are the same as, or
-   *        subdomains of, the host field of aCookie
-   *
-   * @return true if a cookie was found which matches the host, path, and name
-   *         fields of aCookie
-   */
-  boolean findMatchingCookie(in nsICookie2     aCookie,
-                             out unsigned long aCountFromHost);
+  void add(in AUTF8String aDomain, in AUTF8String aPath,
+           in ACString aName, in ACString aValue,
+           in boolean aSecure, in PRInt32 aExpires);
 };
diff --git a/extensions/cookie/nsICookiePermission.idl b/extensions/cookie/nsICookiePermission.idl
index 028c74aa2c10..e1a88edd7332 100644
--- a/extensions/cookie/nsICookiePermission.idl
+++ b/extensions/cookie/nsICookiePermission.idl
@@ -36,7 +36,7 @@
 
 #include "nsISupports.idl"
 
-interface nsICookie2;
+interface nsICookie;
 interface nsIURI;
 interface nsIChannel;
 
@@ -102,12 +102,19 @@ interface nsICookiePermission : nsISupports
    *        the corresponding to aURI
    * @param aCookie
    *        the cookie being added to the cookie database
+   * @param aNumCookiesFromHost
+   *        the number of cookies this host already has set
+   * @param aChangingCookie
+   *        PR_TRUE if the cookie is being modified; otherwise, the cookie
+   *        is new
    *
    * @return true if the cookie can be set.
    */
   boolean canSetCookie(in nsIURI     aURI,
                        in nsIChannel aChannel,
-                       in nsICookie2 aCookie);
+                       in nsICookie  aCookie,
+                       in long       aNumCookiesFromHost,
+                       in boolean    aChangingCookie);
 };
 
 %{ C++
diff --git a/netwerk/cookie/public/nsICookieService.idl b/netwerk/cookie/public/nsICookieService.idl
index 1efb883cf01c..c1abe65d88b2 100644
--- a/netwerk/cookie/public/nsICookieService.idl
+++ b/netwerk/cookie/public/nsICookieService.idl
@@ -47,32 +47,6 @@ interface nsIChannel;
  * Provides methods for setting and getting cookies in the context of a
  * page load.  See nsICookieManager for methods to manipulate the cookie
  * database directly.  This separation of interface is mainly historical.
- *
- * This service broadcasts the following notifications when the cookie
- * list is changed, or a cookie is rejected:
- *
- * topic  : "cookie-changed"
- *          broadcast whenever the cookie list changes in some way. there
- *          are four possible data strings for this notification; one
- *          notification will be broadcast for each change, and will involve
- *          a single cookie.
- * subject: an nsICookie2 interface pointer representing the cookie object
- *          that changed.
- * data   : "deleted"
- *          a cookie was deleted. the subject is the deleted cookie.
- *          "added"
- *          a cookie was added. the subject is the added cookie.
- *          "changed"
- *          a cookie was changed. the subject is the new cookie.
- *          "cleared"
- *          the entire cookie list was cleared. the subject is null.
- *
- * topic  : "cookie-rejected"
- *          broadcast whenever a cookie was rejected from being set as a
- *          result of user prefs.
- * subject: an nsIURI interface pointer representing the host URI of the
- *          rejected cookie.
- * data   : none.
  */
 [scriptable, uuid(011C3190-1434-11d6-A618-0010A401EB10)]
 interface nsICookieService : nsISupports