Backed out changeset 77bd60758c53 (bug 879565) for still asserting, just not quite as much