Revert "Fix app data backup issues"

This reverts commit da9f1c08bd78382064aeb3feb5b26a48cda39d56.