Back out f03664765359 (bug 909542) for unexpected assertions and lack of expected assertions