Revert a couple of changes that survived somehow.

- CheckpointableTimer,Timer -> SimpleTimer