Backed out changeset c63666bdbe08 (bug 1092388) for bustage. DONTBUILD