diff --git a/charts/barbican/templates/bin/_simple_crypto_kek_rewrap.py.tpl b/charts/barbican/templates/bin/_simple_crypto_kek_rewrap.py.tpl
index 8f476f7..8b4e79b 100644
--- a/charts/barbican/templates/bin/_simple_crypto_kek_rewrap.py.tpl
+++ b/charts/barbican/templates/bin/_simple_crypto_kek_rewrap.py.tpl
@@ -37,7 +37,6 @@
         self._session_creator = scoping.scoped_session(
             orm.sessionmaker(
                 bind=self.db_engine,
-                autocommit=True
             )
         )
         self.crypto_plugin = simple_crypto.SimpleCryptoPlugin(conf)
diff --git a/charts/patches/barbican/0002-Use-more-standard-configs-for-DBs.patch b/charts/patches/barbican/0002-Use-more-standard-configs-for-DBs.patch
index 8f9d3fa..b087759 100644
--- a/charts/patches/barbican/0002-Use-more-standard-configs-for-DBs.patch
+++ b/charts/patches/barbican/0002-Use-more-standard-configs-for-DBs.patch
@@ -15,7 +15,7 @@
 index 7a521752..8f476f73 100644
 --- a/barbican/templates/bin/_simple_crypto_kek_rewrap.py.tpl
 +++ b/charts/barbican/templates/bin/_simple_crypto_kek_rewrap.py.tpl
-@@ -33,7 +33,7 @@ class KekRewrap(object):
+@@ -33,11 +33,10 @@ class KekRewrap(object):
  
      def __init__(self, conf, old_kek):
          self.dry_run = False
@@ -24,6 +24,10 @@
          self._session_creator = scoping.scoped_session(
              orm.sessionmaker(
                  bind=self.db_engine,
+-                autocommit=True
+             )
+         )
+         self.crypto_plugin = simple_crypto.SimpleCryptoPlugin(conf)
 diff --git a/barbican/templates/configmap-etc.yaml b/charts/barbican/templates/configmap-etc.yaml
 index d2bff2c0..fba29565 100644
 --- a/barbican/templates/configmap-etc.yaml