Patch from John Levon <levon@movementarian.org>

wli got an oops from this. The callbacks call mod_timer so the timer had
better be setup by then