--- a/dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp
+++ b/dom/xul/templates/nsXULTemplateQueryProcessorRDF.cpp
@@ -1490,18 +1490,16 @@ nsXULTemplateQueryProcessorRDF::CompileS
     TestNode* parentNode;
 
     if (! mSimpleRuleMemberTest) {
         rv = AddDefaultSimpleRules(aQuery, &parentNode);
         if (NS_FAILED(rv))
             return rv;
     }
 
-    bool hasContainerTest = false;
-
     TestNode* prevnode = mSimpleRuleMemberTest;
 
     // Add constraints for the LHS
     const nsAttrName* name;
     for (uint32_t i = 0; (name = aQueryElement->GetAttrNameAt(i)); ++i) {
         // Note: some attributes must be skipped on XUL template query subtree
 
         // never compare against rdf:property, rdf:instanceOf, {}:id or {}:parsetype attribute
@@ -1519,21 +1517,16 @@ nsXULTemplateQueryProcessorRDF::CompileS
 
         nsAutoString value;
         aQueryElement->GetAttr(attrNameSpaceID, attr, value);
 
         TestNode* testnode = nullptr;
 
         if (name->Equals(nsGkAtoms::iscontainer, kNameSpaceID_None) ||
             name->Equals(nsGkAtoms::isempty, kNameSpaceID_None)) {
-            // Tests about containerhood and emptiness. These can be
-            // globbed together, mostly. Check to see if we've already
-            // added a container test: we only need one.
-            if (hasContainerTest)
-                continue;
 
             nsRDFConInstanceTestNode::Test iscontainer =
                 nsRDFConInstanceTestNode::eDontCare;
 
             static nsIContent::AttrValuesArray strings[] =
               {&nsGkAtoms::_true, &nsGkAtoms::_false, nullptr};
             switch (aQueryElement->FindAttrValueIn(kNameSpaceID_None,
                                                    nsGkAtoms::iscontainer,