Backed out changeset a58d895d8197 (bug 645792) for OSX leaks.
Backed out changeset 8c25245410c5 (bug 909888) for being far from NPOTB and breaking B2G tests.
CLOSED TREE