Changed things due to new Couchbase behaviour.