Revert 'block: strict rq_affinity'