diff --git a/defaults/main.yml b/defaults/main.yml
index 2bff5d0..05d4ce3 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -118,10 +118,6 @@ manila_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default(
 manila_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}"
 manila_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}"
 
-## (Qdrouterd) integration
-# TODO(evrardjp): Change structure when more backends will be supported
-manila_oslomsg_amqp1_enabled: "{{ manila_oslomsg_rpc_transport == 'amqp' }}"
-
 ## Manila User / Group
 manila_system_user_name: manila
 manila_system_group_name: manila
@@ -271,9 +267,6 @@ manila_memcached_servers: "{{ memcached_servers }}"
 
 manila_user_pip_packages: []
 
-manila_optional_oslomsg_amqp1_pip_packages:
-  - oslo.messaging[amqp1]
-
 manila_api_init_overrides: {}
 manila_scheduler_init_overrides: {}
 manila_share_init_overrides: {}
diff --git a/tasks/manila_install.yml b/tasks/manila_install.yml
index 21928c9..41b8205 100644
--- a/tasks/manila_install.yml
+++ b/tasks/manila_install.yml
@@ -46,10 +46,7 @@
     venv_build_distro_package_list: "{{ manila_devel_distro_packages }}"
     venv_install_destination_path: "{{ manila_bin | dirname }}"
     venv_pip_install_args: "{{ manila_pip_install_args }}"
-    venv_pip_packages: >-
-      {{ manila_pip_packages |
-           union(manila_user_pip_packages) |
-             union(((manila_oslomsg_amqp1_enabled | bool) | ternary(manila_optional_oslomsg_amqp1_pip_packages, []))) }}
+    venv_pip_packages: "{{ manila_pip_packages | union(manila_user_pip_packages) }}"
     venv_facts_when_changed:
       - section: "manila"
         option: "venv_tag"
diff --git a/vars/debian.yml b/vars/debian.yml
index 386dd71..4007b24 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -66,8 +66,4 @@ manila_lvm_share_distro_packages:
 
 manila_rbd_share_distro_packages: []
 
-manila_oslomsg_amqp1_distro_packages:
-  - libsasl2-modules
-  - sasl2-bin
-
 manila_uwsgi_bin: "/usr/bin"
diff --git a/vars/distro_install.yml b/vars/distro_install.yml
index c686c15..4c5837e 100644
--- a/vars/distro_install.yml
+++ b/vars/distro_install.yml
@@ -35,9 +35,6 @@ manila_package_list: |-
   {% if manila_services['manila-scheduler']['group'] in group_names %}
   {%   set _ = packages.extend(manila_scheduler_distro_packages) %}
   {% endif %}
-  {% if manila_oslomsg_amqp1_enabled | bool %}
-  {%   set _ = packages.extend(manila_oslomsg_amqp1_distro_packages) %}
-  {% endif %}
   {{ packages }}
 
 _manila_bin: "/usr/bin"
diff --git a/vars/redhat.yml b/vars/redhat.yml
index 1598b9f..db65cd8 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -52,9 +52,4 @@ manila_lvm_share_distro_packages:
 
 manila_rbd_share_distro_packages: []
 
-manila_oslomsg_amqp1_distro_packages:
-  - cyrus-sasl-lib
-  - cyrus-sasl-plain
-  - cyrus-sasl-md5
-
 manila_uwsgi_bin: "/usr/sbin"
diff --git a/vars/source_install.yml b/vars/source_install.yml
index e38e7d3..2dd6d19 100644
--- a/vars/source_install.yml
+++ b/vars/source_install.yml
@@ -29,9 +29,6 @@ manila_package_list: |-
   {%     set _ = packages.extend(manila_rbd_share_distro_packages) %}
   {%   endif %}
   {% endif %}
-  {% if manila_oslomsg_amqp1_enabled | bool %}
-  {%   set _ = packages.extend(manila_oslomsg_amqp1_distro_packages) %}
-  {% endif %}
   {{ packages }}
 
 _manila_bin: "/openstack/venvs/manila-{{ manila_venv_tag }}/bin"