Re: [ros-dev] [ros-diffs] [tkreuzer] 47561: revert 47559 and 47560 (once again... sigh)