Revert "revert"

This reverts commit dd465b4f1c42cc3e8df4a501d25e512c6d5dd875.
Revert 0b8c20c..121f625

This rolls back to commit 0b8c20cbf16deecd27bf9fc938c86b401049eeac.
Revert 0171063..143a3ec

This rolls back to commit 0171063a94e2a286d5c15d4b6e0b9e78da9ce2ef.
db_generator updates