This throws errors on 5.3.15 Revert "now with proper timezone"

This reverts commit 989fcdf6691856f4334252f7d8d7c47bbcb0c2e4.