Never mess up the date again

@jed for code review