Reverted changes to file re-order.