[ros-diffs] [greatlrd] 17949: Revert royce3 change from 17948 to 16488 it break choice in bat files, in some case.