Revert 2.0 interrupt code.