Fixed timers
Revert "Fixed timers"

This reverts commit b085b9e4e37dae87093b6f02078225d381e3fa70.