CD-3992 : remove the debug message and add a temporary fix.