Bug 851224 - backout broken change, r=mfinkle