diff --git a/src/common/slurm_protocol_socket_implementation.c b/src/common/slurm_protocol_socket_implementation.c
index d5d7e9b73045fd5e58e0224b03a60b5b2e83f0d1..85790828fce3c6e6560bf3bf88839b116781ff8a 100644
--- a/src/common/slurm_protocol_socket_implementation.c
+++ b/src/common/slurm_protocol_socket_implementation.c
@@ -713,6 +713,8 @@ static int _slurm_vfcntl(int fd, int cmd, va_list va )
 extern void slurm_set_addr_char (slurm_addr_t * addr, uint16_t port, char *host)
 {
 #if 1
+/* NOTE: gethostbyname() is obsolete, but the alternative function (below)
+ * does not work reliably. See bug 2186. */
 	struct hostent * he    = NULL;
 	int	   h_err = 0;
 	char *	   h_buf[4096];
@@ -736,6 +738,9 @@ extern void slurm_set_addr_char (slurm_addr_t * addr, uint16_t port, char *host)
 	}
 	return;
 #else
+/* NOTE: getaddrinfo() currently does not support aliases and is failing with
+ * EAGAIN repeatedly in some cases. Comment out this logic until the function
+ * works as designed. See bug 2186. */
 	struct addrinfo *addrs;
 	struct addrinfo *addr_ptr;