Enabled time fix .. again :|

Merge gone wild...