[ros-diffs] [cgutman] 41089: - We also shouldn't use our Shutdown handler