This reverts commit 4f2228fb1d except for some test code.
4f2228fb1d
every place where a time delta is computed, and then some.