Revert "Modified save behavior and providers"

This reverts commit d0e1d643bf9eb9b177e9dc8db818ea34c8b438e9.