Reverting ZOOKEEPER-1696 patch that was committed.

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1527122 13f79535-47bb-0310-9956-ffa450edef68