Revert "Changes to stop keepalives on unregisters"

This reverts commit 36ad430f0bf50bb20fcdfd1180c9262348e41f79.