[ros-diffs] [navaraf] 19222: Revert r19221.