Fixed regression introduced by patch for bug #67072

This applies to 5.4 and 5.5 only as a legacy fix.
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed regression introduced by patch for bug #67072
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed regression introduced by patch for bug #67072
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed regression introduced by patch for bug #67072