Backed out changeset 725b7db309c3 (bug 1013571) for causing the failures in 1032783