Backed out changesets 857063c82323 and a19479860eb4 (bug 619521) for Valgrind failures.
CLOSED TREE