- Revert "Optimize Persistent Data loading" (Fixes #2229)