gpgme, libassuan: Revert architecture changes