Revert the rest of r1557094.


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