reverting 1.4 due to bug with timezone handling