Reverted to using the CombatTag api in a spot