Revert "Merge pull request #663 from bjori/php-master-fix"

This reverts commit edf64169dfaa457f41cead884e8411a974c18a2a, reversing
changes made to a84bc123651205dc52b49c045ffd5955a0aadc53.