Revert "Use thread_local (instead of static) storage duration due to thread safety...