Backed out changeset f76604a4f025 (bug 932627) for assertions