@jcredding looks like you added behavior here (that I assume HostData was doing before).  I think we need to remove stuff from HostData if so (don't want to have dup logic we have to test twice).