Revert "Run this in a thread"

This reverts commit 4e835c148a7ca0ee17b401a79e15a40f9ca670be.