As per request by NamenIos
Enabled time fix .. again :|

Merge gone wild...
Hmm... that didn't quite work as intended...
Hmm... ats files are suddenly missing on the XZ!? o_O