[ros-diffs] [pschweitzer] 50017: Revert r50016