Bug 855730 - Add more logging and change the order back to the original order.  Reordering should reduce the number of timeouts that spiked when we first changed the order.  r=smaug