diff --git a/roles/backup_client/handlers/main.yml b/roles/backup_client/handlers/main.yml
index 90df2ad0fbc22859787e0533e34adc51fc990260..c9ed4bfd30385d53c5b2f82826970dcf7694a9ec 100644
--- a/roles/backup_client/handlers/main.yml
+++ b/roles/backup_client/handlers/main.yml
@@ -1,13 +1,26 @@
 ---
 
-# Preferably we would use block here, but blocks cannot be used as
-# handlers unfortunately.
-# @TODO: Looks like include_tasks does not work well with relative
-#        paths, unlike the previously used import_tasks. This should
-#        be reported upstream, and updated if the relative inclusion
-#        ever gets fixed.
-- name: Clean-up GnuPG keyring for import of new keys
-  include_tasks: "handlers/cleanup_gnupg.yml"
+# Can't use file module, since one of the files (GnuPG socket)
+# seems to disappear in middle of operation). This is change between
+# Jessie and Stretch.
+- name: Remove current keyring
+  command: "rm -rf /etc/duply/main/gnupg"
+  args:
+    warn: false
+  tags:
+    # [ANSIBLE0012] Commands should not change things if nothing needs doing
+    #   This task is invoked only if user is very specific about requiring to
+    #   run the handlers manually as a way to bring the system to consistency
+    #   after interrupted runs.
+    - skip_ansible_lint
+
+- name: Create keyring directory
+  file:
+    path: "/etc/duply/main/gnupg"
+    state: directory
+    owner: root
+    group: root
+    mode: 0700
 
 - name: Import private keys
   command: "{{ gnupg_binary }} --no-tty --homedir /etc/duply/main/gnupg --import /etc/duply/main/private_keys.asc"