Revert "STORAGEMODEL-246"

This reverts commit a00c2e955ea88c74cccb9747430cca5b114d5f6c.