Merged upstream.

Commented out keep-alive stuff.