[ros-diffs] [cwittich] 41340: revert a part of r41339 as it break ppc port