Working around the time comparison bug some more.