Backout couchbase changes