A correct patch 0f86c164 which was totally brain dead.
Correct comments that are misleading and produced a brain dead patch.
Update notes for client timeout patch.