[ros-diffs] [mkupfer] 34689: revert on request, problem remains