Backed out changeset 11de174da4a4 (bug 873455) for assertions