Fix threadring slurm complaint, take 2

This restores the changes from pull request 472, as we have now branched the release.