Revert change not appropriate for 2.4.x (PHP4 support)