Backed out 2 changesets (bug 734691) for leaks.

Backed out changeset ba88d9730af6 (bug 734691)
Backed out changeset 7d2fbf7b0372 (bug 734691)