timekeeping fix patch got mis-applied