Revert "More --disable-database-connectivity work"

Nah, this was not a good idea. We do need to keep the db related
fields around in some way for document roundtripping. Need to do
database functionality disabling at a different level. If at all, I am
starting to lose trust that it can meaningfully and cleanly be done.

This reverts commit d2f9e1a165314ad9e8588b1d44b3ff0a455ef7f6.