[ros-diffs] [jimtabor] 23222: Put back revision 23192