Revert "Revert "Revert "Simplify connecting to the database in Catalyst"""
Revert "Revert "Revert "Simplify connecting to the database in Catalyst"""

This reverts commit 9d50f9357fb9340913afd5fa272b62e99c529a7e.

berkmancenter/mediacloud,berkmancenter/mediacloud,berkmancenter/mediacloud,berkmancenter/mediacloud,berkmancenter/mediacloud