[ros-diffs] [royce] 17952: remove now-pointless if statement