Fix for dates being in a specific timezone, without losing i18n