Reverting fadddccd53c4e8f41553fef6ca0630f0124ed4a0 and fixing up b6f4227fe3f4b9ce344f159ac505258228fa8aeb#4503

Merged

zwoop merged 1 commit intoapache:7.1.xfrom

ezelkow1:715x_revert

Oct 27, 2018

Commits on Oct 26, 2018

Reverting fadddccd53c4e8f41553fef6ca0630f0124ed4a0 and fixing up a change from b6f4227fe3f4b9ce344f159ac505258228fa8aeb that does not revert cleanly
ezelkow1
committed