Bug#745026: mixes up clients, causing spurious ping replies

[Barak A. Pearlmutter]

I was figuring I'd be able to start with your quick hack and clean it up.
Ah well.
Anyway, thanks for the bug report.