Removed hack for affinity zero