Revert "store complete"

This reverts commit ebdb9454cb1f6dd6d01d849b7a12e9701f3a7d6a.
Revert "Revert "store complete""

This reverts commit f5132c10c08116d1f75eeb26532bb3b6df7f0b8a.