diff --git a/ANNOUNCE b/ANNOUNCE
index 08bc883f6..85f1b4d10 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -65,8 +65,7 @@ Version 1.5.18beta03 [January 1, 2014]
     rearrangement of Makefile.am allow creation of these links to be disabled.
 
 Version 1.5.18beta04 [January 10, 2014]
-  Revised png_check_IHDR() to use PNG_SIZE_MAX instead of PNG_UINT_32_MAX
-    in the test for potential overflow in PNG_ROWBYTES.
+  Removed potentially misleading warning from png_check_IHDR().
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 58aa1521e..c737122f2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4189,8 +4189,7 @@ Version 1.5.18beta03 [January 1, 2014]
     rearrangement of Makefile.am allow creation of these links to be disabled.
 
 Version 1.5.18beta04 [January 10, 2014]
-  Revised png_check_IHDR() to use PNG_SIZE_MAX instead of PNG_UINT_32_MAX
-    in the test for potential overflow in PNG_ROWBYTES.
+  Removed potentially misleading warning from png_check_IHDR().
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/png.c b/png.c
index 9b2ae6965..40c417d82 100644
--- a/png.c
+++ b/png.c
@@ -1222,17 +1222,6 @@ png_check_IHDR(png_structp png_ptr,
       error = 1;
    }
 
-   /* Check for potential overflow in PNG_ROWBYTES calculation */
-   if (error == 0 && width > (PNG_SIZE_MAX
-                 >> 3)      /* 8-byte RGBA pixels */
-                 - 48       /* bigrowbuf hack */
-                 - 1        /* filter byte */
-                 - 7*8      /* rounding of width to multiple of 8 pixels */
-                 - 8        /* extra max_pixel_depth pad */
-                 - error)   /* to prevent always-false compiler warning */
-      png_warning(png_ptr,
-          "Width may be too large for libpng to process pixels");
-
    /* Check other values */
    if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 &&
        bit_depth != 8 && bit_depth != 16)