Revert unintentional docblock change

Revert unintentional docblock change

It looks like commit dd8e59da8f5aafd9d77a0f1f17e5e272d09f643f
introduced an unintended docbloc change. I have reverted this
change in this commit.
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Revert unintentional docblock change
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Revert unintentional docblock change
Merge branch 'PHP-5.6'

* PHP-5.6:
  Revert unintentional docblock change