Had to revert this, as it caused problems with the way `start_new_thread` does things.