Backed out changesets ab64b048ad04 and 025d24d7fee8 (bug 734691) for leaks.