Removing the Timezone patch as it's not really a best practice.