Revert unintentional change to UUID-based storage. This will be handled soon.