Backed out changeset 81bec89d093b (bug 1107775) for Valgrind and other test failures