Revert "Attempts to make this more thread safe" so I can make the tests pass

This reverts commit 096aedbfeba25d98b4692f4433c9c9544884a81d.