Home GnuPG

Remove upstreamed workaround