LPS-50903

It's not really unit testable due to the advice / threadlocal combination.