diff --git a/setup-controller.sh b/setup-controller.sh
index ec548f8f66dcfe1d41cf633569fdf9d4c95275e6..b5c0ab48a6152dca43d4812eac7f7fc022e4566c 100755
--- a/setup-controller.sh
+++ b/setup-controller.sh
@@ -189,19 +189,27 @@ if [ -z "${KEYSTONE_DBPASS}" ]; then
     elif [ $OSVERSION -le $OSKILO ]; then
 	crudini --set /etc/keystone/keystone.conf token provider \
 	    'keystone.token.providers.uuid.Provider'
-	crudini --set /etc/keystone/keystone.conf token driver \
-	    'keystone.token.persistence.backends.memcache.Token'
 	crudini --set /etc/keystone/keystone.conf revoke driver \
 	    'keystone.contrib.revoke.backends.sql.Revoke'
-	crudini --set /etc/keystone/keystone.conf memcache servers \
-	    'localhost:11211'
+	if [ $KEYSTONEUSEMEMCACHE -eq 1 ]; then
+	    crudini --set /etc/keystone/keystone.conf token driver \
+		'keystone.token.persistence.backends.memcache.Token'
+	    crudini --set /etc/keystone/keystone.conf memcache servers \
+		'localhost:11211'
+	else
+	    crudini --set /etc/keystone/keystone.conf token driver \
+		'keystone.token.persistence.backends.sql.Token'
+	fi
     else
 	crudini --set /etc/keystone/keystone.conf token provider 'uuid'
-	#crudini --set /etc/keystone/keystone.conf token driver 'memcache'
-	crudini --set /etc/keystone/keystone.conf token driver 'sql'
 	crudini --set /etc/keystone/keystone.conf revoke driver 'sql'
-	#crudini --set /etc/keystone/keystone.conf memcache servers \
-	#    'localhost:11211'
+	if [ $KEYSTONEUSEMEMCACHE -eq 1 ]; then
+	    crudini --set /etc/keystone/keystone.conf token driver 'memcache'
+	    crudini --set /etc/keystone/keystone.conf memcache servers \
+		'localhost:11211'
+	else
+	    crudini --set /etc/keystone/keystone.conf token driver 'sql'
+	fi
     fi
 
     crudini --set /etc/keystone/keystone.conf DEFAULT verbose ${VERBOSE_LOGGING}
diff --git a/setup-lib.sh b/setup-lib.sh
index e7ae4f8bfcff957583c319e2738a2b51b80a716c..6b3147c1d8986445bf0c6e2cf1d1cb46a72634bf 100755
--- a/setup-lib.sh
+++ b/setup-lib.sh
@@ -59,6 +59,8 @@ TOKENTIMEOUT=14400
 SESSIONTIMEOUT=14400
 CEILOMETER_USE_WSGI=0
 QUOTASOFF=1
+# Off by default; seems to cause intermittent keystone unavailability.
+KEYSTONEUSEMEMCACHE=0
 #
 # We have an 'adminapi' user that gets a random password.  Then, we have
 # the dashboard and instance password, that comes in from geni-lib/rspec as a