As higher optimization might actually schedule a jump to self while waiting for timer interrupts this is a more robust implementation in that sense
This reverts commit 014cf9f8ee.
014cf9f8ee
