Revert r148969, which merged r1488878.

This patch caused a compilation problem which made me review my original
review:
  The patch fixes a problem that doesn't exist on 1.7.x and actually
  applies to a completely different (but related) function.
  
* STATUS:
    Change my vote into a veto.


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