Drop rhbz#1394862 patches again, DB corruption still reported

libdb.spec

@@ -4,7 +4,7 @@
 Summary: The Berkeley DB database library for C
 Name: libdb
 Version: 5.3.28
-Release: 21%{?dist}
+Release: 22%{?dist}
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
 Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz
 # For mt19937db.c
@@ -32,12 +32,6 @@ Patch27: db-5.3.21-memp_stat-upstream-fix.patch
 Patch28: db-5.3.21-mutex_leak.patch
 # fix for overflowing hash variable inside bundled lemon
 Patch29: db-5.3.28-lemon_hash.patch
-# upstream patch adding the ability to recreate libdb's environment on version mismatch
-# or when libpthread.so is modified (rhbz#1394862)
-Patch30: db-5.3.28-condition_variable.patch
-# downstream patch to check whether there is a rpm transaction going on when rpm's environment needs to be rebuilt
-# TODO: remove this patch as soon as we can afford to
-Patch31: db-5.3.28-rpm-lock-check.patch
 
 URL: http://www.oracle.com/database/berkeley-db/
 License: BSD and LGPLv2 and Sleepycat
@@ -440,6 +434,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libdb_java.so
 
 %changelog
+* Fri Jun 09 2017 Adam Williamson <awilliam@redhat.com> - 5.3.28-22
+- Drop rhbz#1394862 patches again, DB corruption still being reported
+
 * Thu Jun 01 2017 Petr Kubat <pkubat@redhat.com> - 5.3.28-21
 - Reintroduce upstream patch for rhbz#1394862
 - Do not rebuild rpm's environment during a rpm transaction