This reverts commit 58d0dcb75b. Fixes a bug where discovery would start every 20-30 seconds.
58d0dcb75b