Revert "Serialize listing of OpenPGP and S/MIME keys"
This reverts commit 55206cfabebdfb33422dd9071afa2cef8c2ed8f5.