Backed out 2 changesets (bug 890072) for possible leaks

Backed out changeset 5e815a5ca50d (bug 890072)
Backed out changeset 7151ab8ff70c (bug 890072)