On the 1.6.x-issue4340 branch, revert r1466009 and r1466010. The changes
merged in those revisions now live on the 1.6.x-issue4340-repos branch.


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