Revert "Use nested objects for tag storage"

This reverts commit d8ad994ac8b66c984ca4b97570eee288b1da7bb6.