Back out b1935bebcf0e (bug 1018482) for assertion failures