This is a lot cleaner.
Remove crappy recursion now that we've converted existing logs