Revert hosts file functionality

Previous autodiscover change overwrote a variable which in turn caused
salt to ignore aliases and additional hosts specified in the pillar.

This change reverts the missing functionality while keeping the
autodiscovery logic intact.
This should be in both for loops I think