Revert "Merge branch 'PHP-5.6'"

This reverts commit aaf5689f4d6e523fd78e0291dbbcd78f3ea988dc, reversing
changes made to 481bf25b6ad70fcdc9c10f02b49c86a0bd4a3d0d.
fix apache handler build