Fixed #5969: Remove arrivalOrder reset codes