diff --git a/docs/production/requirements.md b/docs/production/requirements.md
index 7d73768a42..6d123e28c8 100644
--- a/docs/production/requirements.md
+++ b/docs/production/requirements.md
@@ -81,6 +81,11 @@ on hardware requirements for larger organizations.
   HTTPS, and will redirect HTTP requests to HTTPS.
 - Incoming port 25 if you plan to enable Zulip's [incoming email
   integration](../production/email-gateway.md).
+- Incoming port 4369 should be protected by a firewall to prevent
+  exposing `epmd`, an Erlang service which does not support binding
+  only to localhost. Leaving this exposed will allow unauthenticated
+  remote users to determine that the server is running RabbitMQ, and
+  on which port, though no further information is leaked.
 - Outgoing HTTP(S) access (ports 80 and 443) to the public Internet so
   that Zulip can properly manage image and website previews and mobile
   push notifications. Outgoing Internet access is not required if you
diff --git a/puppet/zulip/files/rabbitmq/rabbitmq-server b/puppet/zulip/files/rabbitmq/rabbitmq-server
deleted file mode 100644
index a1c281b888..0000000000
--- a/puppet/zulip/files/rabbitmq/rabbitmq-server
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file is sourced by /etc/init.d/rabbitmq-server. Its primary
-# reason for existing is to allow adjustment of system limits for the
-# rabbitmq-server process.
-#
-# Maximum number of open file handles. This will need to be increased
-# to handle many simultaneous connections. Refer to the system
-# documentation for ulimit (in man bash) for more information.
-#
-#ulimit -n 1024
-
-export ERL_EPMD_ADDRESS=127.0.0.1
diff --git a/puppet/zulip/manifests/profile/rabbitmq.pp b/puppet/zulip/manifests/profile/rabbitmq.pp
index 0a3dd4c4e0..8f740e3ed7 100644
--- a/puppet/zulip/manifests/profile/rabbitmq.pp
+++ b/puppet/zulip/manifests/profile/rabbitmq.pp
@@ -16,15 +16,6 @@ class zulip::profile::rabbitmq {
     ensure => absent,
   }
 
-  file { '/etc/default/rabbitmq-server':
-    ensure  => file,
-    require => Package[rabbitmq-server],
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
-    source  => 'puppet:///modules/zulip/rabbitmq/rabbitmq-server',
-  }
-
   file { '/etc/rabbitmq/rabbitmq.config':
     ensure  => file,
     require => Package[rabbitmq-server],