Backed out changeset d20b53c907ee (bug 863966) for leaks.