[ros-diffs] [mtempel] 12849: Update to remove some lines of code that broke the build.