Revert r299512

It broke client identifiers because I misunderstood the intent of the code.
There is still a minor issue detected by Coverity (at least, I can't find where
the code proves it isn't an issue). I'll follow up with a better fix for the
CIDs.

Reported by: Ian FREISLICH
Sponsored by: EMC / Isilon Storage Division