Bug 1095257 - backout 54f79521758b due to m3 failures. r=backout r=bz