simplified the previous fix for #64359
Merge branch 'PHP-5.5'

* PHP-5.5:
  simplified the previous fix for #64359