This change partially reverts the change made in #7910, which takes only the
first token of `uname -n` as the hostname.