This reverts commit db186382.

This commit introduced regression with FCP discovery so revert it to fix
discovery for FCP luns.
Signed-off-by: NHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: NMartin K. Petersen <martin.petersen@oracle.com>