Hmm, removing the thread local is technically backwards incompatible, but I guess we can get away with it^^