[ros-diffs] [royce] 17950: unrevert change - this change is correct and works in windows