Revert r1638818, r1639812, r1639717 and r1639814 for new staging.

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