Adding storage patches
Revert "Adding storage patch"

This reverts commit 615151e6c286e2ba81e391dd13ed14717a3b6147.