agree on this
once our own keychain wrapper is in-place (AGIOS-103), I will refactor the code to use it, so I propose at least for this release, to leave it as is (for now).