Revert "October 2019 review. See discussion in GnuPG-Users."
This reverts commit 1c23025c02e3734685979bc5c45bec81fda1a979.