diff --git a/modules/ripple_app/main/ripple_RippleMain.cpp b/modules/ripple_app/main/ripple_RippleMain.cpp
index 142c6abfd..dc781170a 100644
--- a/modules/ripple_app/main/ripple_RippleMain.cpp
+++ b/modules/ripple_app/main/ripple_RippleMain.cpp
@@ -298,19 +298,37 @@ int RippleMain::run (int argc, char const* const* argv)
     po::positional_options_description p;
     p.add ("parameters", -1);
 
-    // These must be added before the Application object is created
-    NodeStore::addBackendFactory (KeyvaDBBackendFactory::getInstance ());
+    //--------------------------------------------------------------------------
+    //
+    // NodeStore backend choices
+    //
+    // Note: These must be added before the Application object is created
+    //
+ 
     NodeStore::addBackendFactory (LevelDBBackendFactory::getInstance ());
     NodeStore::addBackendFactory (MemoryBackendFactory::getInstance ());
     NodeStore::addBackendFactory (NullBackendFactory::getInstance ());
     NodeStore::addBackendFactory (SqliteBackendFactory::getInstance ());
+
 #if RIPPLE_HYPERLEVELDB_AVAILABLE
     NodeStore::addBackendFactory (HyperLevelDBBackendFactory::getInstance ());
 #endif
+
 #if RIPPLE_MDB_AVAILABLE
     NodeStore::addBackendFactory (MdbBackendFactory::getInstance ());
 #endif
 
+    // VFALCO: Disabling KeyvaDB because it is unfinished experimental
+    //         code and there's no sense anyone running it until it meets
+    //         the requirements of a full backend. Now if a programmer wants
+    //         to un-comment it and work on bringing it up to spec on their
+    //         own machine, I certainly won't complain. Let me know, I have
+    //         some new code in a branch.
+    //
+    //NodeStore::addBackendFactory (KeyvaDBBackendFactory::getInstance ());
+
+    //--------------------------------------------------------------------------
+
     if (! RandomNumbers::getInstance ().initialize ())
     {
         Log::out() << "Unable to add system entropy";
diff --git a/rippled-example.cfg b/rippled-example.cfg
index aacc9fac1..a0c5bfdc6 100644
--- a/rippled-example.cfg
+++ b/rippled-example.cfg
@@ -266,7 +266,6 @@
 #       LevelDB             Use Google's LevelDB database (deprecated)
 #       MDB                 Use MDB
 #       none                Use no backend
-#       KeyvaDB             Use OpenCoin's KeyvaDB (experimental)
 #       SQLite              Use SQLite
 #
 #   Required keys: