Changed date/time adapters to not use zone