Revert ill-considered change to order_by