Backed out changeset 0aaa18232af4 (bug 421436) for causing reftest failures