Backed out changeset 7ba0551dd35d (bug 984196) for Valgrind failures