diff --git a/conf/clusto.conf b/conf/clusto.conf
index 1ac4439..66cc3e8 100644
--- a/conf/clusto.conf
+++ b/conf/clusto.conf
@@ -7,9 +7,9 @@
 dsn = sqlite:///clustotest.db
 
 # Versioning mode will keep old records in the database forever after
-# setting a deleted_at_version. Disabling this feature will keep your
-# database small if you change things often.
-versioning = true
+# setting a deleted_at_version. Enabling this feature may cause your database
+# to become large if you add and remove objects and attributes often
+versioning = false
 
 # Enable optional memcached support
 #memcached=127.0.0.1:11211
diff --git a/src/clusto/__init__.py b/src/clusto/__init__.py
index 4c3cbc6..7bd2093 100644
--- a/src/clusto/__init__.py
+++ b/src/clusto/__init__.py
@@ -39,7 +39,7 @@ def connect(config, echo=False):
     if config.has_option('clusto', 'versioning'):
         SESSION.clusto_versioning_enabled = config.getboolean('clusto', 'versioning')
     else:
-        SESSION.clusto_versioning_enabled = True
+        SESSION.clusto_versioning_enabled = False
 
     # Set the log level from config, default is WARNING
     if config.has_option('clusto', 'loglevel'):