[SCSI] Revert "final klist fixes"