Backout a0868fe02c2a because I suspect it caused the debug mochitest failures resulting in the CLOSED TREE