Revert "Incremental checkin for broadcast based discovery"

This reverts commit 6edf00e892b685b253e8971ee27f4c807696448f.