Revert "Merge remote-tracking branch 'upstream/PHP-5.4' into PHP-5.6"

This reverts commit 01957a83b151d1987f34c926046ed957284b0d54, reversing
changes made to a63c0950330997361a082bd35c9e62a70417ec66.

Conflicts:
	ext/mbstring/tests/zend_multibyte-02.phpt
	ext/mbstring/tests/zend_multibyte-06.phpt