Revert "Remove scsi_wait_scan"

This reverts commit f4ca2877f71efa5f8313a220cf6037ae622f2636.