ARQ-1458 Revert "ARQ-1071 Replaced ThreadLocal with InheritableThreadLocal"

This reverts commit cb733a27838737c88ef15cde50d51465f40d324d.