Backed out changeset 774d6d582f40 (bug 897027) for assertions