Revert " More stronger way to detect physical data storage devices"

This reverts commit bca260021014ef44dd995bde1a119602093d5938.

Change-Id: Ibd0068062fec522134fbf97820351a160456e7e7