[ros-diffs] [gschneider] 42621: Re-add r42536, it didn't break the build server