diff --git a/roles/openvpn/tasks/main.yml b/roles/openvpn/tasks/main.yml
index 85ef06a55..b978144f1 100644
--- a/roles/openvpn/tasks/main.yml
+++ b/roles/openvpn/tasks/main.yml
@@ -24,19 +24,20 @@
     group: root
     mode: 0755
 
-# Comment out in future?  Unused for ~2 years as of August 2018:
+# Comment out in future?  Might still be relevant for CentOS but unused for ~2 years as of August 2018:
 - name: Create folder /usr/lib/iiab (not on path) for iiab executable up_wan
   file:
     path: /usr/lib/iiab
     state: directory
 
-- name: Configure OpenVPN
+- name: Configure OpenVPN (BACKS UP FILES IF CHANGED)
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
     owner: root
     group: root
     mode: "{{ item.mode }}"
+    backup: yes
   with_items:
     - { src: 'ca.crt', dest: '/etc/openvpn/keys/ca.crt', mode: '0644' }
     - { src: 'client1.crt', dest: '/etc/openvpn/keys/client1.crt', mode: '0644' }
@@ -47,6 +48,7 @@
     - { src: 'xscenet.conf.j2', dest: '/etc/openvpn/xscenet.conf', mode: '0644' }
     - { src: 'iiab-remote-on.j2', dest: '/usr/bin/iiab-remote-on', mode: '0755' }
     - { src: 'iiab-remote-off', dest: '/usr/bin/iiab-remote-off', mode: '0755' }
+    - { src: 'openvpn_handle.j2', dest: '/etc/iiab/openvpn_handle', mode: '0644' }
     # Comment out in future?  Not recommended as of August 2018:
     - { src: 'iiab-handle.j2', dest: '/usr/bin/iiab-handle', mode: '0755' }
     # Comment out in future?  Might still be relevant for CentOS but unused for ~2 years as of August 2018:
@@ -58,15 +60,15 @@
     # Buggy & rarely used as of August 2018:
     #- { src: 'iiab-vpn.j2', dest: '/usr/bin/iiab-vpn', mode: '0755' }
 
-- name: Save openvpn_handle variable into /etc/iiab/openvpn_handle (BACKS UP FILE IF CHANGED)
-  template:
-    src: openvpn_handle.j2
-    dest: /etc/iiab/openvpn_handle
-    owner: root
-    group: root
-    mode: 0644
-    backup: yes
-  when: openvpn_handle is defined
+#- name: Save openvpn_handle variable into /etc/iiab/openvpn_handle (BACKS UP FILE IF CHANGED)
+#  template:
+#    src: openvpn_handle.j2
+#    dest: /etc/iiab/openvpn_handle
+#    owner: root
+#    group: root
+#    mode: 0644
+#    backup: yes
+#  when: openvpn_handle is defined
 
 # Comment out in future?  up_wan was being installed twice (also above) and
 # was unused for ~2 years as of August 2018: (see 15-openvpn below)