Backout a17b6115cdd7 for causing reftest failures