Remove short circuit for no homehost in common:get-homehost