Revert "Storage commit"

This reverts commit 328da72b3b1cc8882b32367eb3567e3049e3e53c.