am 96f05f90: (-s ours) fix datetime setup problem. DO NOT MERGE

* commit '96f05f909e19a4fe7cee8f961344ef13a882e7e3':
  fix datetime setup problem. DO NOT MERGE