Revert r1620909 as requested by zhakov.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1620928 13f79535-47bb-0310-9956-ffa450edef68
Revert r1593015. Resolve text conflicts.

Suggested by: kotkov

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