[ros-diffs] [gvg] 15685: Revert some incorrect changes that were made during rbuild merge