Revert "Fix tests failing if EC unavailable"

This reverts commit 5e14a1269dbf9f2f73ad7f63be88174f9e5a49fd.
Revert "Merge branch 'PHP-5.4' of git://git.php.net/php-src into PHP-5.4"

This reverts commit 0576c91786ae8967fc0db806e09841c93371e9fc, reversing
changes made to 5cc851e83e8feff5a84aac7db88da186f5bc59ba.