This reverts commit 199b5ff989.
199b5ff989
- Fixed an important crash related to time based registers