Backout bug 951491 on suspicion of causing Valgrind leaks