[ros-diffs] [sginsberg] 38112: - Revert part of 37861 on kjk's request