Revert change to where 'database' config is taken from for connection.

fixes #80