Removed Ned Harvey's modifications to find multithread bug