Back out 5ecede5e0ceb (bug 931864) for assertions