Comment 4 for bug 1866406

Since Mike's patch addresses part of the original bug I've split off the other two pieces of this report. See bug 1911938 for manual reordering and bug 1911940 for random ordering.