Revert "Merge branch 'RemoveTLSWrapper' into 'master'"
This reverts merge request !43206 (merged)
See https://its.cern.ch/jira/browse/ATLASSIM-5237
Change appeared thread-safe in testing, but larger scale tests identified problem. Best to revert for now.