temprevert Heat network discovery change

This heat commit seems to be breaking us.  Trying a temprevert to
verify that it's the problem.

Change-Id: I3ffa8c2f946f8e4c6813dd99e48fbafa260fcdec