Bart has been working on removing the ->scsi_done indirection, so this will need to find a way to interact with that