[ros-diffs] [jimtabor] 31035: Restore to default behavior for now.