Revert "LPS-40048 Keep previous logic in place. Removing the ThreadLocal...

... has changed it"

This reverts commit 32a57bb660e7c7f501b19a30b94d467c018404cc.