Reverting all affinity stuff