Back out some changes for #816 (will tag as known issue)
Back out some changes for #816 (will tag as known issue)

couchbase/couchbase-lite-net,couchbase/couchbase-lite-net,couchbase/couchbase-lite-net,brettharrisonzya/couchbase-lite-net,brettharrisonzya/couchbase-lite-net