Revert "Merge branch 'dbname_and_schema'"

This reverts commit 904f07bef8f1509e38f89c0de38c91e09a54e777, reversing
changes made to 0db8c27441280c504b52df5797f857c3c12351e1.