DESCRIPTION

Revert some changes that cause test failures.

Change-Id: I6aeb56888cb2387dd7c3767f56ae6a8fd4ac535f
Reviewed-on: http://review.couchbase.org/83523
Reviewed-by: Monique Barker <Monique xxx@xxx.xxx
Tested-by: Monique Barker <Monique xxx@xxx.xxx


COMMENTS

author: Jakobe Johnson
date: 2017-09-19 21:13:38.893000000

Change has been successfully cherry-picked as 8434aac2ed5c9eb9251ff0529ebd34acf53dab9b by Jakobe Johnson

-------------------------------------
