Back out 7dbbb6e3d240 (bug 832435) for assertion failures