This is more sophisticated than the current implementation. It's an attempt to address the problems created by the 9 seconds/day of drift I'm seeing for long-running streams.
