TODO: ditch the importer.Interrupt type

Change-Id: I3a7eac29713a5079220b2e56508bd8ca105b14cf