Revert "Recovery mass storage"

This reverts commit f75ca1c53ae5d4cc3a8fb13253e31110cdf00353.