Revert "Fix issue #617: handle TIME_ZONE=None"

This reverts commit ac6d56a53324c04e9ebe192dc0dad98d0262336e.