Back out 35bf7e6dbf90 (bug 882120) for reftest and crashtest failures