Backed out changeset 58541e1f52d2 (bug 1007743)
Backed out changeset c15e59678a60 (bug 1017896) for reftest failures