This reverts commit 42de44592f. It appears there might be thread-safety issues as panics have started occuring when parallism is ramped up. Reverting for now while investigating.
42de44592f