Revert "Update Timer handler"

This reverts commit d75b2a6776ebf510808ba3cfbd6d05f5731ccb51.
Revert "Revert "Update Timer handler""

This reverts commit 8209cb1d2047d3c99c285ac3a17443652297f944.