T6358: Remove duplicate host name handling
(cherry picked from commit 240f199cdfadbc12ce713dae74c8db3af44a398c)