Revert part of comp warning fix.  Code reverted due to crash when
player changed teams.