[ros-diffs] [tkreuzer] 46022: revert part of 46020, adding back po types