remove usage of Thread.current for fallbacks as this configuration is not thread-specific
remove all usages of Thread.local
Merge remote-tracking branch 'hube/fix-fallbacks' into nonpandoras

* hube/fix-fallbacks:
  remove all usages of Thread.local
  remove usage of Thread.current for fallbacks as this configuration is not thread-specific