Backed out changeset 932daea51104 (bug 1104623)
Backed out changeset a2146311e4fa (bug 1104623) for memory leaks