diff --git a/src/nvidia-modeset/src/nvkms-hdmi.c b/src/nvidia-modeset/src/nvkms-hdmi.c
index 691d8d1b9..e5680ffa7 100644
--- a/src/nvidia-modeset/src/nvkms-hdmi.c
+++ b/src/nvidia-modeset/src/nvkms-hdmi.c
@@ -151,7 +151,7 @@ static void CalculateVideoInfoFrameColorFormat(
 }
 
 /*
- * GetHDMISupportCap() - find the HDMI capabilities of
+ * GetHDMISupportCap() - find the HDMI capabilities of 
  * the gpu and the display device.
  */
 
@@ -1030,22 +1030,10 @@ static NvBool FillELDBuffer(const NVDpyEvoRec *pDpyEvo,
     if (status == NVT_STATUS_SUCCESS) {
         /*
          * NvTiming_GetProductName() returns a nul-terminated string, but the
-         * string in the EDID is terminated with 0x0A and padded with 0x20.
-         * Put back these special characters.
+         * string in the EDID is originally terminated with 0x0A and padded
+         * with 0x20.
+         * We removed the special characters to not break the resulting eld.
          */
-//        NvBool pastTerminator = FALSE;
-//        NvU32 i;
-
-//        for (i = 0; i < NVT_EDID_LDD_PAYLOAD_SIZE; i++) {
-//            if (pastTerminator) {
-//                name[i] = 0x20;
-//            }
-//            if (name[i] == '\0') {
-//                name[i] = 0x0A;
-//                pastTerminator = TRUE;
-//            }
-//        }
-
         monitorNameLen = NVT_EDID_LDD_PAYLOAD_SIZE;
         pEld->buffer[4] |= NVT_EDID_LDD_PAYLOAD_SIZE;
         nvkms_memcpy(&pEld->buffer[20], name,