revert recent storage changes until time allows to look into resultant issues