Revert "ds store again"

This reverts commit e370a031a4c80a265096c8ae9edf47a0c8ad3a1b.