Simpler fix for storage compilation

This reverts commit 1a909a3c5083dd11056f1a0428fe40cf1e1f4680.