Reverted change to avoidance scaling.