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