diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 7d0cbee0de..ab5827065c 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -680,10 +680,6 @@ Release 2.7.0 - UNRELEASED
     HADOOP-11642. Upgrade azure sdk version from 0.6.0 to 2.0.0.
     (Shashank Khandelwal and Ivan Mitic via cnauroth)
 
-    HADOOP-11638. OpensslSecureRandom.c pthreads_thread_id should support
-    FreeBSD and Solaris in addition to Linux (Kiran Kumar M R via Colin P.
-    McCabe)
-
   OPTIMIZATIONS
 
     HADOOP-11323. WritableComparator#compare keeps reference to byte array.
diff --git a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c
index f30ccbee66..6c31d10599 100644
--- a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c
+++ b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/random/OpensslSecureRandom.c
@@ -29,10 +29,6 @@
 #include <sys/types.h>
 #endif
 
-#if defined(__FreeBSD__)
-#include <pthread_np.h>
-#endif
-
 #ifdef WINDOWS
 #include <windows.h>
 #endif
@@ -278,17 +274,7 @@ static void pthreads_locking_callback(int mode, int type, char *file, int line)
 
 static unsigned long pthreads_thread_id(void)
 {
-  unsigned long thread_id = 0;
-#if defined(__linux__)
-  thread_id = (unsigned long)syscall(SYS_gettid);
-#elif defined(__FreeBSD__)
-  thread_id = (unsigned long)pthread_getthreadid_np();
-#elif defined(__sun)
-  thread_id = (unsigned long)pthread_self();
-#else
-#error "Platform not supported"
-#endif
-  return thread_id;
+  return (unsigned long)syscall(SYS_gettid);
 }
 
 #endif /* UNIX */