Backed out changeset 8b1b90e5fd34 (bug 988863) for rooting hazard failures