Revert no_order and switch back to Algorithm::Diff (old bug fixed)