This reverts commit 7d42566459.
7d42566459
- Fixed an important crash related to time based registers