Back out a5885f4bebdb (bug 811261) for assertion failures