diff --git a/processor/processor.m4 b/processor/processor.m4
index 035539e..b1c01fe 100644
--- a/processor/processor.m4
+++ b/processor/processor.m4
@@ -774,11 +774,7 @@ DEF_STRUCT_P_FUNC(`xc_entry_data_php_t', , `dnl {{{
 
 #ifdef HAVE_XCACHE_CONSTANT
 	DISPATCH(zend_uint, constinfo_cnt)
-	IFRESTORE(`
-		COPY(constinfos)
-	', `
-		STRUCT_ARRAY(constinfo_cnt, xc_constinfo_t, constinfos)
-	')
+	STRUCT_ARRAY(constinfo_cnt, xc_constinfo_t, constinfos)
 #endif
 
 	DISPATCH(zend_uint, funcinfo_cnt)
diff --git a/xcache.c b/xcache.c
index 18693ec..1ef0d97 100644
--- a/xcache.c
+++ b/xcache.c
@@ -1178,6 +1178,9 @@ static zend_op_array *xc_compile_restore(xc_entry_t *stored_xce, zend_file_handl
 		catched = 1;
 	} zend_end_try();
 
+	if (php.constinfos) {
+		efree(php.constinfos);
+	}
 	if (php.funcinfos) {
 		efree(php.funcinfos);
 	}