and "[Support] Try to fix bot failure after 8ddcd1dc" This reverts commits f70f1801 and 8ddcd1dc as this was breaking the MacOS build, which doesn't support thread_local.