For ENG-5959, thread safety for fun and profit