diff --git a/ANNOUNCE b/ANNOUNCE
index 0f91cdcedd74731aa27ec8b409df8b549571b986..eb7e6fd6150be786096dd9bf67d6194de0bb80ea 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.17rc02 - March 7, 2015
+Libpng 1.6.17rc02 - March 8, 2015
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -68,11 +68,9 @@ Version 1.6.17beta06 [February 27, 2015]
 Version 1.6.17rc01 [March 4, 2015]
   No changes.
 
-Version 1.6.17rc02 [March 7, 2015]
+Version 1.6.17rc02 [March 8, 2015]
   Removed some comments that the configure script did not handle
     properly from scripts/pnglibconf.dfa and pnglibconf.h.prebuilt.
-  Stopped a potential memory leak in png_set_unknown_chunks(). Breaks
-    tests/pngunknown-sAPI so it's temporarily marked SKIP.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 819c49e36cc3d063f14299d1d621443b939fea4a..f0b04a19bd4e557cac94302c4eac83e67d5d5d06 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5169,11 +5169,9 @@ Version 1.6.17beta06 [February 27, 2015]
 Version 1.6.17rc01 [March 4, 2015]
   No changes.
 
-Version 1.6.17rc02 [March 7, 2015]
+Version 1.6.17rc02 [March 8, 2015]
   Removed some comments that the configure script did not handle
     properly from scripts/pnglibconf.dfa and pnglibconf.h.prebuilt.
-  Stopped a potential memory leak in png_set_unknown_chunks(). Breaks
-    tests/pngunknown-sAPI so it's temporarily marked SKIP.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngset.c b/pngset.c
index 2b9164603e43186746680a9d019de9626df102a4..de39db5fad119ee7988b7456e18dfb8a857ce639 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1180,17 +1180,6 @@ png_set_unknown_chunks(png_const_structrp png_ptr,
       return;
    }
 
-   if ((np->location & (PNG_HAVE_IHDR|PNG_HAVE_PLTE|PNG_AFTER_IDAT)) == 0)
-   {
-      png_free(png_ptr, np);
-      np = NULL;
-      png_chunk_report(png_ptr,
-          "invalid chunk location in png_set_unknown_chunks",
-          PNG_CHUNK_WRITE_ERROR);
-
-      return;
-   }
-
    png_free(png_ptr, info_ptr->unknown_chunks);
    info_ptr->unknown_chunks = np; /* safe because it is initialized */
    info_ptr->free_me |= PNG_FREE_UNKN;
@@ -1267,7 +1256,6 @@ png_set_unknown_chunk_location(png_const_structrp png_ptr, png_inforp info_ptr,
 }
 #endif /* STORE_UNKNOWN_CHUNKS */
 
-
 #ifdef PNG_MNG_FEATURES_SUPPORTED
 png_uint_32 PNGAPI
 png_permit_mng_features (png_structrp png_ptr, png_uint_32 mng_features)
diff --git a/tests/pngunknown-sAPI b/tests/pngunknown-sAPI
index 3d759c3d46f2b72b498c985a38bb5c3889f7ea4a..e087ef25a7e10c4fbd2a698432e7f83bca0e5f33 100755
--- a/tests/pngunknown-sAPI
+++ b/tests/pngunknown-sAPI
@@ -1,4 +1,2 @@
 #!/bin/sh
-code=77 # skipped
-exit 77
 exec ./pngunknown bKGD=save cHRM=save gAMA=save all=discard iCCP=save sBIT=save sRGB=save "${srcdir}/pngtest.png"