Back out 134f2dc02468 (bug 939659) for assertions