Revert "Storages fix ( Maybe )"

This reverts commit fcc3578fa3e26e6fe34adfc48c338f84dbf63510.