Backed out changeset c61753316ddb (bug 1109985)
Backed out changeset 2187c2cdeea9 (bug 1109985) for memory leaks