[ros-diffs] [cfinck] 32715: Revert r32706, unfortunately this wasn't the problem (according to reports from two users)