Revert "Remove reset storage"

This reverts commit 1b7be6f3d3246ade8d9a58cc65294317e58ac26b.
Revert "Revert "Remove reset storage""

This reverts commit 6d9d7b822d0a3efe2150b8fcde1240ac9dcd9516.