Get rid of terrible timing crap that was causing segfault.