[ros-diffs] [cgutman] 35607: - Revert r35601 - This should always be set if FCB->CurrentThread is non-NULL