--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -2480,22 +2480,16 @@ var gCSSProperties = {
   "font": {
     domProp: "font",
     inherited: true,
     type: CSS_TYPE_TRUE_SHORTHAND,
     subproperties: [ "font-style", "font-variant", "font-weight", "font-size", "line-height", "font-family", "font-stretch",
                      "font-size-adjust", "font-feature-settings", "font-language-override",
                      "font-kerning", "font-synthesis", "font-variant-alternates", "font-variant-caps", "font-variant-east-asian",
                      "font-variant-ligatures", "font-variant-numeric", "font-variant-position" ],
-    /*
-     * Vertical vs horizontal writing-mode can affect the line-height component
-     * of the 'font' shorthand because font metrics may not be symmetrical,
-     * so we require writing-mode:initial to ensure consistency.
-     */
-    prerequisites: { "writing-mode": "initial" },
     initial_values: [ (gInitialFontFamilyIsSansSerif ? "medium sans-serif" : "medium serif") ],
     other_values: [ "large serif", "9px fantasy", "bold italic small-caps 24px/1.4 Times New Roman, serif", "small inherit roman", "small roman inherit",
       // system fonts
       "caption", "icon", "menu", "message-box", "small-caption", "status-bar",
       // Gecko-specific system fonts
       "-moz-window", "-moz-document", "-moz-desktop", "-moz-info", "-moz-dialog", "-moz-button", "-moz-pull-down-menu", "-moz-list", "-moz-field", "-moz-workspace",
     ],
     invalid_values: [ "9 fantasy", "-2px fantasy" ]
@@ -2748,21 +2742,18 @@ var gCSSProperties = {
     type: CSS_TYPE_LONGHAND,
     /*
      * Inheritance tests require consistent font size, since
      * getComputedStyle (which uses the CSS2 computed value, or
      * CSS2.1 used value) doesn't match what the CSS2.1 computed
      * value is.  And they even require consistent font metrics for
      * computation of 'normal'.   -moz-block-height requires height
      * on a block.
-     * Vertical vs horizontal writing-mode can affect line-height
-     * because font metrics may not be symmetrical, so we require
-     * writing-mode:initial to ensure consistency.
      */
-    prerequisites: { "font-size": "19px", "font-size-adjust": "none", "font-family": "serif", "font-weight": "normal", "font-style": "normal", "height": "18px", "display": "block", "writing-mode": "initial"},
+    prerequisites: { "font-size": "19px", "font-size-adjust": "none", "font-family": "serif", "font-weight": "normal", "font-style": "normal", "height": "18px", "display": "block"},
     initial_values: [ "normal" ],
     other_values: [ "1.0", "1", "1em", "47px", "-moz-block-height" ],
     invalid_values: []
   },
   "list-style": {
     domProp: "listStyle",
     inherited: true,
     type: CSS_TYPE_TRUE_SHORTHAND,