Revert "MB-100: undo unintended consequences of preceding merge"

This reverts commit 1922c036c60ce9519dd5b4c621bb98783823b73a.

Change-Id: Idad2449840070c9954b7674c1a71d970290f048a
Reviewed-on: http://review.couchbase.org/29532
Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>