ce50f2cf61
Revert "Secrets: Refactor data_key_id out of the encoded secure value payload…"
This reverts commit acad92864e.