WP-1116: rearrange date field.