Remove special-casing of GnuPG