So where we use the DATE_TIME_FORMATTER we should check the actual type and use the correct formatter.  Updating.