Another attempt at a fix for DeleteSamples and ResetDateTime.