Revert a late change to the heartbeat patch that breaks the ability to have duplicate host:port with different server names