[ros-diffs] [aandrejevic] 64671: [FAST486] Revert the previous fix and fix it again, but properly.