[ros-diffs] [cfinck] 30846: Looks like my previous changes were already enough, so we can finally remove this hack :-) See issue #2779 for more details.