Revert "Advanced storage: swap primary storage for apps"

This reverts commit 0a5ec64211d6f4a3dd6fdfc01a36de1b27bf049b.