Backed out changeset d58403b60c77 (bug 959089)
Backed out changeset 1a6ada013610 (bug 959089)
Backed out changeset fbb86a21aba0 (bug 924622) for leaks on OS X 10.6; CLOSED TREE