--- a/dom/xul/crashtests/107518-1.xml
+++ b/dom/xul/crashtests/107518-1.xml
@@ -5,36 +5,36 @@
 <window
    id         = "xulnote-main-window"
    xmlns      = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    xmlns:html = "http://www.w3.org/1999/xhtml" 
    onload     = "init();"
 >
   <scrollbox>
    <vbox style="background-color:white;">
-      <text value="hahaha  0"/>
-      <text value="hahaha  1"/>
-      <text value="hahaha  2"/>
-      <text value="hahaha  3"/>
-      <text value="hahaha  4"/>
-      <text value="hahaha  5"/>
-      <text value="hahaha  6"/>
-      <text value="hahaha  7"/>
-      <text value="hahaha  8"/>
-      <text value="hahaha  9"/>
-      <text value="hahaha 10"/>
-      <text value="hahaha 11"/>
-      <text value="hahaha 12"/>
-      <text value="hahaha 13"/>
-      <text value="hahaha 14"/>
-      <text value="hahaha 15"/>
-      <text value="hahaha 16"/>
-      <text value="hahaha 17"/>
-      <text value="hahaha 18"/>
-      <text value="hahaha 19"/>
+      <label value="hahaha  0"/>
+      <label value="hahaha  1"/>
+      <label value="hahaha  2"/>
+      <label value="hahaha  3"/>
+      <label value="hahaha  4"/>
+      <label value="hahaha  5"/>
+      <label value="hahaha  6"/>
+      <label value="hahaha  7"/>
+      <label value="hahaha  8"/>
+      <label value="hahaha  9"/>
+      <label value="hahaha 10"/>
+      <label value="hahaha 11"/>
+      <label value="hahaha 12"/>
+      <label value="hahaha 13"/>
+      <label value="hahaha 14"/>
+      <label value="hahaha 15"/>
+      <label value="hahaha 16"/>
+      <label value="hahaha 17"/>
+      <label value="hahaha 18"/>
+      <label value="hahaha 19"/>
    </vbox>
 <scrollbar
     id="identifier"
     align="horizontal"
     curpos="20"
     maxpos="100"
     increment="1"
     pageincrement="10"/>

--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -4138,17 +4138,16 @@ nsCSSFrameConstructor::FindXULTagData(co
       SCROLLABLE_XUL_CREATE(resizer, NS_NewResizerFrame),
       SCROLLABLE_XUL_CREATE(toolbarpaletteitem, NS_NewBoxFrame),
       SCROLLABLE_XUL_CREATE(treecolpicker, NS_NewButtonBoxFrame),
       SIMPLE_XUL_CREATE(image, NS_NewImageBoxFrame),
       SIMPLE_XUL_CREATE(spring, NS_NewLeafBoxFrame),
       SIMPLE_XUL_CREATE(spacer, NS_NewLeafBoxFrame),
       SIMPLE_XUL_CREATE(treechildren, NS_NewTreeBodyFrame),
       SIMPLE_XUL_CREATE(treecol, NS_NewTreeColFrame),
-      SIMPLE_XUL_CREATE(text, NS_NewTextBoxFrame),
       SIMPLE_TAG_CHAIN(button, nsCSSFrameConstructor::FindXULButtonData),
       SIMPLE_TAG_CHAIN(toolbarbutton, nsCSSFrameConstructor::FindXULButtonData),
       SIMPLE_TAG_CHAIN(label, nsCSSFrameConstructor::FindXULLabelData),
       SIMPLE_TAG_CHAIN(description,
                        nsCSSFrameConstructor::FindXULDescriptionData),
       SIMPLE_XUL_CREATE(menu, NS_NewMenuFrame),
       SIMPLE_XUL_CREATE(menubutton, NS_NewMenuFrame),
       SIMPLE_XUL_CREATE(menulist, NS_NewMenuFrame),

--- a/layout/base/tests/chrome/dialog_with_positioning_window.xul
+++ b/layout/base/tests/chrome/dialog_with_positioning_window.xul
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="setTimeout(runTest, 0)">
   <vbox>
-    <text value="powered by example.com" style="padding: 16px;"/>
+    <label value="powered by example.com" style="padding: 16px;"/>
   </vbox>
   <hbox id="t" style="display: block; position: fixed; right: 16px; bottom: 16px;">
     <button label="OK"/>
   </hbox>
 <script><![CDATA[
 var SimpleTest = window.arguments[0].SimpleTest;
 var SpecialPowers = window.arguments[0].SpecialPowers;
 var is = window.arguments[0].is;