Revert r1501049,r1501371 due to concerns raised on dev@.

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