diff --git a/crypto/err/err.c b/crypto/err/err.c
index b879a221..de1b4a7a 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -333,6 +333,10 @@ int ERR_get_next_error_library(void) {
   return ret;
 }
 
+void ERR_remove_state(unsigned long pid) {
+  ERR_clear_error();
+}
+
 void ERR_clear_system_error(void) {
   errno = 0;
 }
diff --git a/include/openssl/err.h b/include/openssl/err.h
index e5915344..30dc4afe 100644
--- a/include/openssl/err.h
+++ b/include/openssl/err.h
@@ -269,11 +269,11 @@ OPENSSL_EXPORT void ERR_print_errors_fp(FILE *file);
 OPENSSL_EXPORT void ERR_clear_error(void);
 
 /* ERR_remove_thread_state clears the error queue for the current thread if
- * |tid| is NULL. Otherwise it does nothing because it's no longer possible to
- * delete the error queue for other threads.
+ * |tid| is NULL. Otherwise it calls |assert(0)|, because it's no longer
+ * possible to delete the error queue for other threads.
  *
  * Error queues are thread-local data and are deleted automatically. You do not
- * need to call this function. See |ERR_clear_error|. */
+ * need to call this function. Use |ERR_clear_error|. */
 OPENSSL_EXPORT void ERR_remove_thread_state(const CRYPTO_THREADID *tid);
 
 
@@ -285,6 +285,12 @@ OPENSSL_EXPORT void ERR_remove_thread_state(const CRYPTO_THREADID *tid);
 OPENSSL_EXPORT int ERR_get_next_error_library(void);
 
 
+/* Deprecated functions. */
+
+/* |ERR_remove_state| calls |ERR_clear_error|. */
+OPENSSL_EXPORT void ERR_remove_state(unsigned long pid);
+
+
 /* Private functions. */
 
 /* ERR_clear_system_error clears the system's error value (i.e. errno). */
@@ -496,15 +502,6 @@ enum {
 #define OPENSSL_DECLARE_ERROR_FUNCTION(lib, function_name)
 
 
-/* Android compatibility section.
- *
- * These functions are declared, temporarily, for Android because
- * wpa_supplicant will take a little time to sync with upstream. Outside of
- * Android they'll have no definition. */
-
-OPENSSL_EXPORT void ERR_remove_state(unsigned long pid);
-
-
 #if defined(__cplusplus)
 } /* extern C */
 #endif