Revert "trying to support multiple ephermal drives - tmp patch"

This reverts commit 77265a7fb46c09ec90169d737e0f1cfdae2f687b.