Backed out changeset d5cd910dda69 (bug 1033098) for OSX assertions.