diff --git a/nsprpub/TAG-INFO b/nsprpub/TAG-INFO
index c58b41a0753b..a7fcc27ead6e 100644
--- a/nsprpub/TAG-INFO
+++ b/nsprpub/TAG-INFO
@@ -1 +1 @@
-NSPR_4_18_BETA2
+NSPR_4_18_BETA3
diff --git a/nsprpub/config/prdepend.h b/nsprpub/config/prdepend.h
index 6c66b37ca0fc..e49e92677e3e 100644
--- a/nsprpub/config/prdepend.h
+++ b/nsprpub/config/prdepend.h
@@ -10,4 +10,3 @@
  */
 
 #error "Do not include this header file."
-
diff --git a/nsprpub/pr/src/pthreads/ptthread.c b/nsprpub/pr/src/pthreads/ptthread.c
index e57abd61e9c0..9e12606ea3f4 100644
--- a/nsprpub/pr/src/pthreads/ptthread.c
+++ b/nsprpub/pr/src/pthreads/ptthread.c
@@ -1064,11 +1064,6 @@ void PR_HPUX10xInit(shl_t handle, int loading)
 
 void _PR_Fini(void)
 {
-    /* We disable the cleanup code on Mac OSX, see bug 1399746.
-     * The .dylib containing NSPR can get unloaded, and _PR_Fini called,
-     * and other code calling NSPR functions can get executed afterwards.
-    */
-#ifndef DARWIN
     void *thred;
     int rv;
 
@@ -1100,7 +1095,6 @@ void _PR_Fini(void)
     pt_book.keyCreated = PR_FALSE;
     /* TODO: free other resources used by NSPR */
     /* _pr_initialized = PR_FALSE; */
-#endif
 }  /* _PR_Fini */
 
 PR_IMPLEMENT(PRStatus) PR_Cleanup(void)