Revert "Before switching to interrupts"

This reverts commit 0536f4fd05cc647305416168d26f5522823dc6ea.