diff --git a/roles/kiwix/tasks/main.yml b/roles/kiwix/tasks/main.yml
index b0f745adf..d55284ff1 100644
--- a/roles/kiwix/tasks/main.yml
+++ b/roles/kiwix/tasks/main.yml
@@ -1,21 +1,21 @@
-# EXPERIMENTAL i686 CODE PATH
-- name: "Set Kiwix filename to d/l: {{ kiwix_src_file_i686 }} (i686)"
+- name: "Set Kiwix filename to d/l: {{ kiwix_src_file_armhf }} (armv6l or armv71)"
   set_fact:
-     kiwix_src_file: "{{ kiwix_src_file_i686 }}"
-     kiwix_src_bin_only: False
-  when: ansible_machine == "i686"
-
+     kiwix_src_file: "{{ kiwix_src_file_armhf }}"
+     kiwix_src_bin_only: True
+  when: ansible_machine == "armv7l" or ansible_machine == "armv6l"
+  
 - name: "Set Kiwix filename to d/l: {{ kiwix_src_file_linux64 }} (x86_64)"
   set_fact:
      kiwix_src_file: "{{ kiwix_src_file_linux64 }}"
      kiwix_src_bin_only: True
   when: ansible_machine == "x86_64"
 
-- name: "Set Kiwix filename to d/l: {{ kiwix_src_file_armhf }} (armv6l or armv71)"
+- name: "Set Kiwix filename to d/l: {{ kiwix_src_file_i686 }} (i686)"
   set_fact:
-     kiwix_src_file: "{{ kiwix_src_file_armhf }}"
-     kiwix_src_bin_only: True
-  when: ansible_machine == "armv7l" or ansible_machine == "armv6l"
+     kiwix_src_file: "{{ kiwix_src_file_i686 }}"
+     kiwix_src_bin_only: False
+  when: ansible_machine == "i686"
+# COMMENT OUT LINE ABOVE TO TEST OF i686 CODE PATH ON X86_64 (WORKS NOV 2017)
 
 - name: Download Kiwix software to /opt/iiab/downloads
   get_url: