Revert r931697, thereby allowing APR 1.4.x again.  The issue cited in that revision has not yet been resolved, but the broken parts have been reverted for the time being.
Revert r931697, thereby allowing APR 1.4.x again.  The issue cited in that
revision has not yet been resolved, but the broken parts have been reverted
for the time being.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@938744 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion