#77 DrainRs time tracking reverted back