Backed out changeset 8b33af450fc6 (bug 945632) for OSX asserts.
CLOSED TREE