Backing out to standard way of handling dates