[ros-diffs] [tkreuzer] 37418: Remove even more stubs