MDL-46991 Availability: Conditional dates not updated on restore