diff -u Zend/zend_execute_API.c Zend.new/zend_execute_API.c
--- Zend/zend_execute_API.c	2006-01-07 16:29:00.000000000 -0500
+++ Zend.new/zend_execute_API.c	2006-01-09 18:49:40.000000000 -0500
@@ -939,14 +939,8 @@
 		}
 	} else {
 		EG(This) = NULL;
-		if (calling_scope && !(EX(function_state).function->common.fn_flags & ZEND_ACC_STATIC)) {
-			int severity;
-			if (EX(function_state).function->common.fn_flags & ZEND_ACC_ALLOW_STATIC) {
-				severity = E_STRICT;
-			} else {
-				severity = E_ERROR;
-			}
-			zend_error(severity, "Non-static method %v::%v() cannot be called statically", calling_scope->name, EX(function_state).function->common.function_name);
+		if (calling_scope && !(EX(function_state).function->common.fn_flags & ZEND_ACC_STATIC) && !(EX(function_state).function->common.fn_flags & ZEND_ACC_ALLOW_STATIC)) {
+			zend_error(E_ERROR, "Non-static method %v::%v() cannot be called statically", calling_scope->name, EX(function_state).function->common.function_name);
 		}
 	}
 
diff -u Zend/zend_vm_def.h Zend.new/zend_vm_def.h
--- Zend/zend_vm_def.h	2006-01-04 18:52:07.000000000 -0500
+++ Zend.new/zend_vm_def.h	2006-01-09 18:52:58.000000000 -0500
@@ -1838,18 +1838,9 @@
 	EX_T(opline->result.u.var).var.fcall_returned_reference = 0;
 
 	if (EX(function_state).function->common.scope) {
-		if (!EG(This) && !(EX(function_state).function->common.fn_flags & ZEND_ACC_STATIC)) {
-			int severity;
-			char *severity_word;
-			if (EX(function_state).function->common.fn_flags & ZEND_ACC_ALLOW_STATIC) {
-				severity = E_STRICT;
-				severity_word = "should not";
-			} else {
-				severity = E_ERROR;
-				severity_word = "cannot";
-			}
+		if (!EG(This) && !(EX(function_state).function->common.fn_flags & ZEND_ACC_STATIC) && !(EX(function_state).function->common.fn_flags & ZEND_ACC_ALLOW_STATIC)) {
 			/* FIXME: output identifiers properly */
-			zend_error(severity, "Non-static method %v::%v() %s be called statically", EX(function_state).function->common.scope->name, EX(function_state).function->common.function_name, severity_word);
+			zend_error(E_ERROR, "Non-static method %v::%v() cannot be called statically", EX(function_state).function->common.scope->name, EX(function_state).function->common.function_name);
 		}
 	}
 	if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) {
diff -u Zend/zend_vm_execute.h Zend.new/zend_vm_execute.h
--- Zend/zend_vm_execute.h	2006-01-04 18:52:07.000000000 -0500
+++ Zend.new/zend_vm_execute.h	2006-01-09 18:53:39.000000000 -0500
@@ -163,18 +163,9 @@
 	EX_T(opline->result.u.var).var.fcall_returned_reference = 0;
 
 	if (EX(function_state).function->common.scope) {
-		if (!EG(This) && !(EX(function_state).function->common.fn_flags & ZEND_ACC_STATIC)) {
-			int severity;
-			char *severity_word;
-			if (EX(function_state).function->common.fn_flags & ZEND_ACC_ALLOW_STATIC) {
-				severity = E_STRICT;
-				severity_word = "should not";
-			} else {
-				severity = E_ERROR;
-				severity_word = "cannot";
-			}
+		if (!EG(This) && !(EX(function_state).function->common.fn_flags & ZEND_ACC_STATIC) && !(EX(function_state).function->common.fn_flags & ZEND_ACC_ALLOW_STATIC)) {
 			/* FIXME: output identifiers properly */
-			zend_error(severity, "Non-static method %v::%v() %s be called statically", EX(function_state).function->common.scope->name, EX(function_state).function->common.function_name, severity_word);
+			zend_error(E_ERROR, "Non-static method %v::%v() cannot be called statically", EX(function_state).function->common.scope->name, EX(function_state).function->common.function_name);
 		}
 	}
 	if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) {