Bugfix: timer reset
Revert "Bugfix: timer reset"

This reverts commit d8480467e8751aa7a2c03484b43b15c64077d002.