Back out b817abcebadf (bug 888109) for unexpected assertions