Bug 1059033 - Backout part 6 for causing reftest failures