[ros-diffs] [royce] 19601: revert 19600 until I can figure out how to correct keep it silent on non-msys systems