Revert "Merge remote-tracking branch 'origin/PHP-5.6'"

This reverts commit 38229d13d14bb0bda736d52a9a4f25c121445692, reversing
changes made to 77f172725a37c8ddee750bf6970529a1570fbc86.
Better fix for bug #68446
Merge branch 'PHP-5.6'

* PHP-5.6:
  Better fix for bug #68446