Revert "Recovery mass storage"

This reverts commit 6cff614df012dd00247296adbafc9c52d9b50962.