Revert r1617909 since a better solution to the problem has been found.


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