Attempt #2 at fixing daylight savings time