* Backed out r7276 through r7278. This is too large a change to make during a featur...

* Backed out r7276 through r7278.  This is too large a change to make during a feature freeze; it is the wrong approach; and it also produced crashes and corrupt data on my test system during evaluation (even after a make distclean).  We will revisit this after the release.