Use base-mapped dates for sorting (broken in dd477e15)