[ros-diffs] [gschneider] 42571: Revert r42536 for build server diagnosis