[ros-diffs] [cwittich] 18593: reverted to 17089, we have to fix rbuild instead