Backed out changeset 71568f10952a (bug 988326) for assertions