Revert "php 5.4 fix"

This reverts commit e9daa93eb337d7106cfd4c52a6c509ab08121bf4.