Revert "Changes to stop keepalives on unregisters"

This reverts commit 8187a92d48abe24643f8ea2f1b0988857f0ccb1b.