Backout bug 972591, part 3, for a top crash.