[ros-diffs] [cwittich] 36488: more correct fix