CLOSED TREE Backed out changeset 61f98b1d29f9 (bug 1003448) Backed out changeset 8e947d1636f1 (bug 1003448)