Back out 2f5e6cd1cc9c (bug 989829) for assertion failures