reverted all of the timer changes