[ros-diffs] [hyperion] 38622: Reverting poorly conceived commit