[ros-diffs] [navaraf] 19201: Revert r19199.