diff --git a/defaults/main.yml b/defaults/main.yml
index f2ffeb6..eae494b 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -16,7 +16,7 @@
 #- openldap-servers-2.4.40-13.el7.x86_64.rpm
 
 openldap_repo_host: http://mirror.centos.org/centos/6/os/x86_64/Packages
-openldap_package_names:
+openldap_versioned_names:
 - openldap-2.4.40-16.el6.x86_64.rpm
 - openldap-clients-2.4.40-16.el6.x86_64.rpm
 - openldap-servers-2.4.40-16.el6.x86_64.rpm
diff --git a/tasks/with_no_proxy.yml b/tasks/with_no_proxy.yml
index e78f52c..5506480 100644
--- a/tasks/with_no_proxy.yml
+++ b/tasks/with_no_proxy.yml
@@ -8,17 +8,16 @@
   with_items: "{{ openldap }}"
   when: opdk_version | version_compare('4.17.05', '>')
 
-#- block:
-#- name: Downgrade openldap packages if needed
-#  become: yes
-#  yum:
-#    name: "{{ item }}"
-#    state: present
-#    allow_downgrade: yes
-#  with_items: "{{ openldap_2_4_40 }}"
-#  when: opdk_version | version_compare('4.17.01', '>=') and opdk_version | version_compare('4.17.05', '<=')
-
 - block:
+  - name: Downgrade openldap packages if needed
+    become: yes
+    yum:
+      name: "{{ item }}"
+      state: present
+      allow_downgrade: yes
+    with_items: "{{ openldap_2_4_40 }}"
+    when:  opdk_version | version_compare('4.17.05', '<=')
+
 #  - name: Remove existing openldap packages
 #    yum:
 #      name: "{{ item }}"
@@ -29,10 +28,10 @@
 
 #  - name: Clean yum cache
 #    shell: "yum clean all"
-#
-#  - name: Install openldap manually
-#    shell: "rpm -Uvh --oldpackage {{ openldap_repo_host }}/{{ openldap_package_names[0] }}"
-#
+
+  - name: Install openldap manually
+    shell: "rpm -Uvh --oldpackage {{ openldap_repo_host }}/{{ openldap_package_names[0] }}"
+
 #  - name: Install the remainder openldap manually
 #    shell: "rpm -ivh --oldpackage {{ openldap_manual_download[1:2] }}"
 
@@ -49,7 +48,7 @@
       name: "{{ openldap_repo_host}}/{{ item  }}"
       state: present
       allow_downgrade: yes
-    with_items: "{{ openldap_package_names }}"
+    with_items: "{{ openldap_versioned_names }}"
 #
 #  - name: Download openldap manually, may need to change the link
 #    yum: