Revert "use filters to find the correct set of hosts, to speed and stabilize"

This reverts commit fff01a5145d83dd4b6dcd6cd9d9ca35b8559b34b.