IMPORTANT: these changes will require dateutil or pytz