Revert "Additional PHP 5.3 fixes"

This reverts commit 9e48bf6b4b4b75953263500bfa132ffd442d9dc7.