diff --git a/deployment/puppet/cluster/manifests/rabbitmq_fence.pp b/deployment/puppet/cluster/manifests/rabbitmq_fence.pp
index 6a11d54a97..dd04838f15 100644
--- a/deployment/puppet/cluster/manifests/rabbitmq_fence.pp
+++ b/deployment/puppet/cluster/manifests/rabbitmq_fence.pp
@@ -61,14 +61,6 @@ class cluster::rabbitmq_fence(
     enable => true,
   } ->
 
-  file { '/etc/rabbitmq/node_name_prefix_for_messaging':
-    ensure  => file,
-    mode    => '0644',
-    content => hiera('node_name_prefix_for_messaging', 'messaging-'),
-    notify  => Service['rabbit-fence'],
-    require => Package['fuel-rabbit-fence'],
-  } ->
-
   service { 'rabbit-fence':
     ensure  => $enabled ? {
       true  => running,
diff --git a/files/rabbit-fence/rabbit-fence.py b/files/rabbit-fence/rabbit-fence.py
index 6bb185e845..7d4427bfe6 100644
--- a/files/rabbit-fence/rabbit-fence.py
+++ b/files/rabbit-fence/rabbit-fence.py
@@ -60,11 +60,11 @@ def catchall_signal_lh(*args, **kwargs):
         node = args[0]
         this_node = socket.gethostname().split('.')[0]
         node_name = node.split('.')[0]
-        cmd = 'cat /etc/rabbitmq/node_name_prefix_for_messaging 2>/dev/null'
-        node_name_prefix = bash_command(cmd)
-        if node_name_prefix == 'nil' or node_name_prefix in node_name:
-            node_name_prefix = ''
-        node_to_remove = 'rabbit@%s%s' % (node_name_prefix, node_name)
+
+        # We're looking for a line like "NODENAME=rabbit@messaging-node-6"
+        with open('/etc/rabbitmq/rabbitmq-env.conf', 'r') as fl:
+            node_to_remove = re.findall('^\s*NODENAME\s*=\s*(\S*)\s*$',
+                                        fl.read(), re.MULTILINE)[0]
 
         my_logger.info("Got %s that left cluster" % node)
         my_logger.debug(kwargs)