Revert "Time fix(2)"

This reverts commit 30627126d76b5dafc6b05f05577bdaf952dc3a9f.