Revert "Fix two deprecation warnings"
This reverts commit a6649461deea3d42f3236e37f46800d206eb83c3.
Needs gpgme 1.24 which isn't available yet on Windows.