On the 1.7.x-issue4340 branch, undo r1465998, which merged changes which now
live on the 1.7.x-issue4340-repos branch.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4340@1480950 13f79535-47bb-0310-9956-ffa450edef68