Switch back to upstream CHH/php-build