Backed out changeset eefad3e4e594 for valgrind failures on a CLOSED TREE.

--HG--
extra : rebase_source : b5b018f5a5f23fe12600e64508ef075794d707fe
merge m-i -> ash