Revert "storage: allow swapping primary storage for apps"

This reverts commit accfc996738869f98b4bb7bd47ae2023b039f0b9.