[ros-diffs] [chorns] 14312: Revert part of previous change