Backed out changeset d389df23ffc9 (bug 884281) for OSX crashes.
CLOSED TREE