[ros-diffs] [hbirr] 16761: reverted last change