Backed out changeset 1bf0cdeacb22 (bug 867460) for assertions in various test suites

Landed on a CLOSED TREE