Revert "Storage notification changes"

This reverts commit fd4d00172dc7f2e101fb2c269368970d64343034.