Make avoid origins local to group again, less resource costly and more consistent