No longer doing that awful keepalive hack
Slight formatting change