Remove bug introduced by merge conflict

Change-Id: I038b5061b6f6dd284e24c2a99722bf5accf6c59a
Reviewed-on: http://review.couchbase.org/23747
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>