Updated to use the Thread affinity patch that we tried to upstream