Revert "Timer changes"

This reverts commit 4fdc54545bcaf2ffa9154a9fbc0c4b2c151796b2.
Revert "Revert "Timer changes""

This reverts commit 92422debe0e6d3ef65bd3ad14b7bdfde4c710fb5.