Fixed bug where re-adding a handler disabled interrupts and added the
ability to remove a handler.