Back out 8a36e37f46ed (bug 969159) for Valgrind bustage