Since @jamalex is busy, and because the database schema isn't so different, for testing purposes I'll change this back.  I may also file an issue to do the database setup (and potentially the data copying) in Ansible.