Backed out changeset daaee7df86ae (bug 907147) for assertions