Revert "Time display issue, rebased for 1.8dev"

This reverts commit bc773adb7ea1224bf8a22a8fcb947a79fa205a0d.