Backed out changeset 2960ea3e50ca (bug 1881157) for causing crashtest assertion failu...