abandon refactoring started 2012-08-27

Change-Id: I055a60930b07cfeef4a5df72665acd7fb3ee3807
Reviewed-on: http://review.couchbase.org/26867
Reviewed-by: Philip Labee <philip@couchbase.com>
Tested-by: Philip Labee <philip@couchbase.com>