Revert "Changes to stop keepalives on unregisters"

This reverts commit 4c9a1fa2a791d37629b7272581f6d52c4b0f9666.