Revert "Merge commit: fix timer overflows"

This reverts commit 0e002306029dd1cdb2854818cd73f78573907d59.