Back out 58982e7b5c45 (bug 1092311) for asserting