Backed out changesets 4856bfe6102b and 9052bf4c9948 (bug 1027221) for asserts/crashes.