Revert "Getting things ready for PostgreSQL switch"

This reverts commit 6e3dd571e35fc4b17dfc6c9c786265ffce66e65e. Errors on
the server, reverting this will help me figure out what went wrong.