Undoing the last commit for now to focus on fixing multithreading bugs