[Couchbase] Backed-out some of the previous changes to get back to previous API.