Some things still don't work, but this way, at least the basic functionality is restored GnuPG-Bug-ID: 7039 (cherry picked from commit 1f00fbc9)