[ros-diffs] [sserapion] 36467: Convert to spec. two for the price of one.