diff --git a/mozilla/caps/src/Makefile.in b/mozilla/caps/src/Makefile.in
index 8b38f5e5bca..6e0fa6dcc19 100644
--- a/mozilla/caps/src/Makefile.in
+++ b/mozilla/caps/src/Makefile.in
@@ -45,7 +45,6 @@ REQUIRES	= xpcom \
 		  intl \
 		  docshell \
 		  windowwatcher \
-		  content \
 		  $(NULL)
 
 CPPSRCS		= \
diff --git a/mozilla/caps/src/nsScriptSecurityManager.cpp b/mozilla/caps/src/nsScriptSecurityManager.cpp
index b090cdcd065..c1fa320b26c 100644
--- a/mozilla/caps/src/nsScriptSecurityManager.cpp
+++ b/mozilla/caps/src/nsScriptSecurityManager.cpp
@@ -79,7 +79,6 @@
 #include "nsIPrefBranchInternal.h"
 #include "nsIJSRuntimeService.h"
 #include "nsIObserverService.h"
-#include "nsIContent.h"
 
 static NS_DEFINE_IID(kIStringBundleServiceIID, NS_ISTRINGBUNDLESERVICE_IID);
 static NS_DEFINE_IID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
@@ -100,48 +99,21 @@ JSValIDToString(JSContext *cx, const jsval idval) {
     return NS_REINTERPRET_CAST(PRUnichar*, JS_GetStringChars(str));
 }
 
-// Helper class to get stuff from the ClassInfo and not waste extra time with
-// virtual method calls for things it has already gotten
-class ClassInfoData
+static inline PRBool
+IsDOMClass(nsIClassInfo* aClassInfo)
 {
-public:
-    ClassInfoData(nsIClassInfo *aClassInfo)
-        : mClassInfo(aClassInfo), mDidGetFlags(PR_FALSE)
-    {
-    }
+    if (!aClassInfo)
+        return PR_FALSE;
 
-    PRUint32 GetFlags()
-    {
-        if (!mDidGetFlags) {
-            if (mClassInfo) {
-                mDidGetFlags = PR_TRUE;
-                nsresult rv = mClassInfo->GetFlags(&mFlags);
-                if (NS_FAILED(rv)) {
-                    mFlags = 0;
-                }
-            } else {
-                mFlags = 0;
-            }
-        }
+    PRUint32 classFlags;
+    nsresult rv = aClassInfo->GetFlags(&classFlags);
 
-        return mFlags;
-    }
+    return NS_SUCCEEDED(rv) && (classFlags & nsIClassInfo::DOM_OBJECT);
+}
 
-    PRBool IsDOMClass()
-    {
-        return GetFlags() & nsIClassInfo::DOM_OBJECT;
-    }
-    PRBool IsContentNode()
-    {
-        return GetFlags() & nsIClassInfo::CONTENT_NODE;
-    }
-
-private:
-    nsIClassInfo *mClassInfo; // WEAK
-    PRBool mDidGetFlags;
-    PRUint32 mFlags;
-};
- 
+// Convenience method to get the current js context stack.
+// Uses cached JSContextStack service instead of calling through
+// to the service manager.
 JSContext *
 nsScriptSecurityManager::GetCurrentJSContext()
 {
@@ -662,17 +634,13 @@ nsScriptSecurityManager::CheckPropertyAccessImpl(PRUint32 aAction,
             securityLevel = GetPropertyPolicy(aProperty, cpolicy, aAction);
     }
 
-    // Hold the class info data here so we don't have to go back to virtual
-    // methods all the time
-    ClassInfoData classInfoData(aClassInfo);
-
     if (securityLevel.level == SCRIPT_SECURITY_UNDEFINED_ACCESS)
     {   
         // No policy found for this property so use the default of last resort.
         // If we were called from somewhere other than XPConnect
         // (no XPC call context), assume this is a DOM class. Otherwise,
         // ask the ClassInfo.
-        if (!aCallContext || classInfoData.IsDOMClass())
+        if (!aCallContext || IsDOMClass(aClassInfo))
             securityLevel.level = SCRIPT_SECURITY_SAME_ORIGIN_ACCESS;
         else
             securityLevel.level = SCRIPT_SECURITY_NO_ACCESS;
@@ -747,18 +715,7 @@ nsScriptSecurityManager::CheckPropertyAccessImpl(PRUint32 aAction,
             rv = NS_OK;
     }
 
-    if (NS_SUCCEEDED(rv) && classInfoData.IsContentNode())
-    {
-        // No access to anonymous content from the web!  (bug 164086)
-        nsCOMPtr<nsIContent> content(do_QueryInterface(aObj));
-        NS_ASSERTION(content, "classinfo had CONTENT_NODE set but node did not"
-                              "implement nsIContent!  Fasten your seat belt.");
-        if (content->IsNativeAnonymous()) {
-            rv = NS_ERROR_DOM_SECURITY_ERR;
-        }
-    }
-
-    if (NS_SUCCEEDED(rv))
+    if NS_SUCCEEDED(rv)
     {
 #ifdef DEBUG_mstoltz
     printf(" GRANTED.\n");
@@ -2307,7 +2264,7 @@ nsScriptSecurityManager::CanCreateWrapper(JSContext *cx,
     PR_FREEIF(iidStr);
 #endif
 // XXX Special case for nsIXPCException ?
-    if (ClassInfoData(aClassInfo).IsDOMClass())
+    if (IsDOMClass(aClassInfo))
     {
 #if 0
         printf("DOM class - GRANTED.\n");
diff --git a/mozilla/content/base/public/nsIContent.h b/mozilla/content/base/public/nsIContent.h
index 4f951a1082c..dd3ab2f7da6 100644
--- a/mozilla/content/base/public/nsIContent.h
+++ b/mozilla/content/base/public/nsIContent.h
@@ -98,20 +98,6 @@ public:
    */
   NS_IMETHOD SetParent(nsIContent* aParent) = 0;
 
-  /**
-   * Get whether this content is C++-generated anonymous content
-   * @see nsIAnonymousContentCreator
-   * @return whether this content is anonymous
-   */
-  NS_IMETHOD_(PRBool) IsNativeAnonymous() const = 0;
-
-  /**
-   * Set whether this content is anonymous
-   * @see nsIAnonymousContentCreator
-   * @param aAnonymous whether this content is anonymous
-   */
-  NS_IMETHOD_(void) SetNativeAnonymous(PRBool aAnonymous) = 0;
-
   /**
    * Get the namespace that this element's tag is defined in
    * @param aResult the namespace [OUT]
diff --git a/mozilla/content/base/src/nsGenericDOMDataNode.cpp b/mozilla/content/base/src/nsGenericDOMDataNode.cpp
index 4f02e38523a..cea3d571cee 100644
--- a/mozilla/content/base/src/nsGenericDOMDataNode.cpp
+++ b/mozilla/content/base/src/nsGenericDOMDataNode.cpp
@@ -678,19 +678,6 @@ nsGenericDOMDataNode::SetParent(nsIContent* aParent)
   return NS_OK;
 }
 
-NS_IMETHODIMP_(PRBool)
-nsGenericDOMDataNode::IsNativeAnonymous() const
-{
-  nsIContent* parent = GetParentWeak();
-  return parent && parent->IsNativeAnonymous();
-}
-
-NS_IMETHODIMP_(void)
-nsGenericDOMDataNode::SetNativeAnonymous(PRBool aAnonymous)
-{
-  // XXX Need to fix this to do something - bug 165110
-}
-
 NS_IMETHODIMP
 nsGenericDOMDataNode::GetNameSpaceID(PRInt32& aID) const
 {
diff --git a/mozilla/content/base/src/nsGenericDOMDataNode.h b/mozilla/content/base/src/nsGenericDOMDataNode.h
index dd82b7596e5..ed764cc1a4f 100644
--- a/mozilla/content/base/src/nsGenericDOMDataNode.h
+++ b/mozilla/content/base/src/nsGenericDOMDataNode.h
@@ -173,8 +173,6 @@ public:
                          PRBool aCompileEventHandlers);
   NS_IMETHOD GetParent(nsIContent*& aResult) const;
   NS_IMETHOD SetParent(nsIContent* aParent);
-  NS_IMETHOD_(PRBool) IsNativeAnonymous() const;
-  NS_IMETHOD_(void) SetNativeAnonymous(PRBool aAnonymous);
   NS_IMETHOD GetNameSpaceID(PRInt32& aID) const;
   NS_IMETHOD NormalizeAttrString(const nsAString& aStr,
                                  nsINodeInfo*& aNodeInfo);
diff --git a/mozilla/content/base/src/nsGenericElement.cpp b/mozilla/content/base/src/nsGenericElement.cpp
index 19f82d0397a..d25d1c6970d 100644
--- a/mozilla/content/base/src/nsGenericElement.cpp
+++ b/mozilla/content/base/src/nsGenericElement.cpp
@@ -1856,22 +1856,6 @@ nsGenericElement::SetParent(nsIContent* aParent)
   return NS_OK;
 }
 
-NS_IMETHODIMP_(PRBool)
-nsGenericElement::IsNativeAnonymous() const
-{
-  return !!(GetFlags() & GENERIC_ELEMENT_IS_ANONYMOUS);
-}
-
-NS_IMETHODIMP_(void)
-nsGenericElement::SetNativeAnonymous(PRBool aAnonymous)
-{
-  if (aAnonymous) {
-    SetFlags(GENERIC_ELEMENT_IS_ANONYMOUS);
-  } else {
-    UnsetFlags(GENERIC_ELEMENT_IS_ANONYMOUS);
-  }
-}
-
 nsresult
 nsGenericElement::GetNameSpaceID(PRInt32& aNameSpaceID) const
 {
diff --git a/mozilla/content/base/src/nsGenericElement.h b/mozilla/content/base/src/nsGenericElement.h
index c8f1f347f91..410712dfd77 100644
--- a/mozilla/content/base/src/nsGenericElement.h
+++ b/mozilla/content/base/src/nsGenericElement.h
@@ -71,34 +71,26 @@ class nsINodeInfo;
 
 typedef unsigned long PtrBits;
 
-/** This bit will be set if the nsGenericElement has nsDOMSlots */
+// This bit will be set if the nsGenericElement has nsDOMSlots
 #define GENERIC_ELEMENT_DOESNT_HAVE_DOMSLOTS   0x00000001U
 
-/**
- * This bit will be set if the element has a range list in the range list hash
- */
+// This bit will be set if the element has a range list in the range
+// list hash
 #define GENERIC_ELEMENT_HAS_RANGELIST          0x00000002U
 
-/**
- * This bit will be set if the element has a listener manager in the listener
- * manager hash
- */
+// This bit will be set if the element has a listener manager in the
+// listener manager hash
 #define GENERIC_ELEMENT_HAS_LISTENERMANAGER    0x00000004U
 
-/** Whether this content is anonymous */
-#define GENERIC_ELEMENT_IS_ANONYMOUS           0x00000008U
+// The number of bits to shift the bit field to get at the content ID
+#define GENERIC_ELEMENT_CONTENT_ID_BITS_OFFSET 3
 
-/** The number of bits to shift the bit field to get at the content ID */
-#define GENERIC_ELEMENT_CONTENT_ID_BITS_OFFSET 4
-
-/** This mask masks out the bits that are used for the content ID */
+// This mask masks out the bits that are used for the content ID
 #define GENERIC_ELEMENT_CONTENT_ID_MASK \
   ((~PtrBits(0)) << GENERIC_ELEMENT_CONTENT_ID_BITS_OFFSET)
 
-/**
- * The largest value for content ID that fits in
- * GENERIC_ELEMENT_CONTENT_ID_MASK
- */
+// The largest value for content ID that fits in
+// GENERIC_ELEMENT_CONTENT_ID_MASK
 #define GENERIC_ELEMENT_CONTENT_ID_MAX_VALUE \
   ((~PtrBits(0)) >> GENERIC_ELEMENT_CONTENT_ID_BITS_OFFSET)
 
@@ -347,8 +339,6 @@ public:
                          PRBool aCompileEventHandlers);
   NS_IMETHOD GetParent(nsIContent*& aResult) const;
   NS_IMETHOD SetParent(nsIContent* aParent);
-  NS_IMETHOD_(PRBool) IsNativeAnonymous() const;
-  NS_IMETHOD_(void) SetNativeAnonymous(PRBool aAnonymous);
   NS_IMETHOD GetNameSpaceID(PRInt32& aNameSpaceID) const;
   NS_IMETHOD GetTag(nsIAtom*& aResult) const;
   NS_IMETHOD GetNodeInfo(nsINodeInfo*& aResult) const;
diff --git a/mozilla/content/html/content/src/nsAttributeContent.cpp b/mozilla/content/html/content/src/nsAttributeContent.cpp
index e7ae1c07b46..109c0ee8cf8 100644
--- a/mozilla/content/html/content/src/nsAttributeContent.cpp
+++ b/mozilla/content/html/content/src/nsAttributeContent.cpp
@@ -97,8 +97,6 @@ public:
   NS_IMETHOD SetDocument(nsIDocument* aDocument, PRBool aDeep, PRBool aCompileEventHandlers);
   NS_IMETHOD GetParent(nsIContent*& aResult) const;
   NS_IMETHOD SetParent(nsIContent* aParent);
-  NS_IMETHOD_(PRBool) IsNativeAnonymous() const { return PR_TRUE; }
-  NS_IMETHOD_(void) SetNativeAnonymous(PRBool aAnonymous) { }
 
   NS_IMETHOD GetNameSpaceID(PRInt32& aID) const {
     aID = kNameSpaceID_None;
diff --git a/mozilla/content/xul/content/src/nsXULElement.cpp b/mozilla/content/xul/content/src/nsXULElement.cpp
index e56b0da7650..946f12bff45 100644
--- a/mozilla/content/xul/content/src/nsXULElement.cpp
+++ b/mozilla/content/xul/content/src/nsXULElement.cpp
@@ -2170,18 +2170,6 @@ nsXULElement::SetParent(nsIContent* aParent)
     return NS_OK;
 }
 
-NS_IMETHODIMP_(PRBool)
-nsXULElement::IsNativeAnonymous() const
-{
-    return PR_FALSE;
-}
-
-NS_IMETHODIMP_(void)
-nsXULElement::SetNativeAnonymous(PRBool aAnonymous)
-{
-    // XXX Need to make this actually do something - bug 165110
-}
-
 NS_IMETHODIMP
 nsXULElement::CanContainChildren(PRBool& aResult) const
 {
diff --git a/mozilla/content/xul/content/src/nsXULElement.h b/mozilla/content/xul/content/src/nsXULElement.h
index 8fc13281f60..8a6b458b9c9 100644
--- a/mozilla/content/xul/content/src/nsXULElement.h
+++ b/mozilla/content/xul/content/src/nsXULElement.h
@@ -411,8 +411,6 @@ public:
     NS_IMETHOD SetDocument(nsIDocument* aDocument, PRBool aDeep, PRBool aCompileEventHandlers);
     NS_IMETHOD GetParent(nsIContent*& aResult) const;
     NS_IMETHOD SetParent(nsIContent* aParent);
-    NS_IMETHOD_(PRBool) IsNativeAnonymous() const;
-    NS_IMETHOD_(void) SetNativeAnonymous(PRBool aAnonymous);
     NS_IMETHOD CanContainChildren(PRBool& aResult) const;
     NS_IMETHOD ChildCount(PRInt32& aResult) const;
     NS_IMETHOD ChildAt(PRInt32 aIndex, nsIContent*& aResult) const;
diff --git a/mozilla/dom/src/base/nsDOMClassInfo.h b/mozilla/dom/src/base/nsDOMClassInfo.h
index 441edb5bc5d..70c8aca5f5d 100644
--- a/mozilla/dom/src/base/nsDOMClassInfo.h
+++ b/mozilla/dom/src/base/nsDOMClassInfo.h
@@ -383,7 +383,6 @@ public:
                        JSObject *globalObj, JSObject **parentObj);
   NS_IMETHOD AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                          JSObject *obj, jsval id, jsval *vp, PRBool *_retval);
-  NS_IMETHOD GetFlags(PRUint32 *aFlags);
 
   static nsIClassInfo *doCreate(nsDOMClassInfoData* aData)
   {
@@ -601,7 +600,6 @@ public:
                          JSObject *obj, jsval id, jsval *vp, PRBool *_retval);
   NS_IMETHOD SetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                          JSObject *obj, jsval id, jsval *vp, PRBool *_retval);
-  NS_IMETHOD GetFlags(PRUint32* aFlags);
 
   static nsIClassInfo *doCreate(nsDOMClassInfoData* aData)
   {
diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp
index 925e7f1ba12..9fbc16e2006 100644
--- a/mozilla/layout/base/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp
@@ -5211,7 +5211,6 @@ nsCSSFrameConstructor::CreateAnonymousFrames(nsIPresShell*            aPresShell
       if (NS_FAILED(anonymousItems->QueryElementAt(i, NS_GET_IID(nsIContent), getter_AddRefs(content))))
         continue;
 
-      content->SetNativeAnonymous(PR_TRUE);
       content->SetParent(aParent);
       content->SetDocument(aDocument, PR_TRUE, PR_TRUE);
 
diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
index 925e7f1ba12..9fbc16e2006 100644
--- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
@@ -5211,7 +5211,6 @@ nsCSSFrameConstructor::CreateAnonymousFrames(nsIPresShell*            aPresShell
       if (NS_FAILED(anonymousItems->QueryElementAt(i, NS_GET_IID(nsIContent), getter_AddRefs(content))))
         continue;
 
-      content->SetNativeAnonymous(PR_TRUE);
       content->SetParent(aParent);
       content->SetDocument(aDocument, PR_TRUE, PR_TRUE);
 
diff --git a/mozilla/xpcom/components/nsIClassInfo.idl b/mozilla/xpcom/components/nsIClassInfo.idl
index 3f6ee755e67..1a9ecfef479 100644
--- a/mozilla/xpcom/components/nsIClassInfo.idl
+++ b/mozilla/xpcom/components/nsIClassInfo.idl
@@ -101,11 +101,6 @@ interface nsIClassInfo : nsISupports
     const PRUint32 DOM_OBJECT           = 1 << 3;
     const PRUint32 PLUGIN_OBJECT        = 1 << 4;
     const PRUint32 EAGER_CLASSINFO      = 1 << 5;
-    /**
-     * 'flags' attribute bitflag: whether objects of this type implement
-     * nsIContent.
-     */
-    const PRUint32 CONTENT_NODE         = 1 << 6;
     
     // The high order bit is RESERVED for consumers of these flags. 
     // No implementor of this interface should ever return flags