Revert 2.0 interrupt code.
2.0.3 Release
Merge branch 'work-0200'