Use KMS more inline with upstream example code.