diff --git a/php5/sapi/cli/php_cli.c b/php5/sapi/cli/php_cli.c
index e91dbfa..0d5ab3f 100644
--- a/php5/sapi/cli/php_cli.c
+++ b/php5/sapi/cli/php_cli.c
@@ -107,6 +107,7 @@
 #define PHP_MODE_REFLECTION_EXTENSION   10
 #define PHP_MODE_REFLECTION_EXT_INFO    11
 
+#if 0
 #define HARDCODED_INI			\
 	"html_errors=0\n"			\
 	"register_argc_argv=1\n"	\
@@ -114,6 +115,7 @@
 	"output_buffering=0\n"		\
 	"max_execution_time=0\n"	\
 	"max_input_time=-1\n"
+#endif
 
 static char *php_optarg = NULL;
 static int php_optind = 1;
@@ -362,6 +364,14 @@ static void sapi_cli_ini_defaults(HashTable *configuration_hash)
 	INI_DEFAULT("report_zend_debug", "0");
 	INI_DEFAULT("display_errors", "1");
 
+ 	/* XXXlegion */
+ 	INI_DEFAULT("html_errors", "0");
+ 	INI_DEFAULT("register_argc_argv", "1");
+ 	INI_DEFAULT("implicit_flush", "1");
+ 	INI_DEFAULT("output_buffering", "0");
+ 	INI_DEFAULT("max_execution_time", "0");
+ 	INI_DEFAULT("max_input_time", "-1");
+
 	FREE_ZVAL(tmp);
 }
 /* }}} */
@@ -644,10 +654,12 @@ int main(int argc, char *argv[])
 	setmode(_fileno(stderr), O_BINARY);		/* make the stdio mode be binary */
 #endif
 
+#if 0
 	ini_entries_len = strlen(HARDCODED_INI);
 	cli_sapi_module.ini_entries = malloc(ini_entries_len+2);
 	memcpy(cli_sapi_module.ini_entries, HARDCODED_INI, ini_entries_len+1);
 	cli_sapi_module.ini_entries[ini_entries_len+1] = 0;
+#endif
 
 	while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0))!=-1) {
 		switch (c) {