Backed out changeset ca4caf0d721c (bug 853549) for valgrind testfailures