Timezone setup code moved