Backed out changeset 82159a263dd9 (bug 1006957) for OSX asserts/crashes.