Following up on r1539182, revert one fix and try another.

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