Bring back correct date parsing