[ros-diffs] [tkreuzer] 42395: Leftover from r42394, gendib, too