[ros-diffs] [cgutman] 35155: - Revert my lib changes until I figure out some problems with them