MT#8965 try removing the patch