This reverts commit cbf06a5d64. This turned out to be a bad idea because it allow us to fast-forward the wall clock time (see previous commit).
cbf06a5d64