Backed out changeset 07ad58eaf448
Backed out changeset 13bba566a7c2 (bug 1071227) DONTBUILD