[ros-diffs] [gvg] 15839: Revert r15838 since it breaks the build