[ros-diffs] [weiden] 23825: Revert r23824. This needs to go into the clipboard branch for now.