Backed out changesets 7f0b177e61cd and 44a0d7a4230b (bug 1027221) for asserts/crashes.