Revert "Merge pull request #232 from johnf/fix_client_keepalive_cycle"

This reverts commit 287effb7cf72b5e4e0181a98a87f3ac665d5f9fd, reversing
changes made to dc741359e1ba75472545e9ced62ca4868a29c0a5.