Rebase: Potentially fix issue where units wouldn't go unconscious