bug 918435 - backout 25.0b1 temp changes; r=rail