Revert "Merge branch 'postgresql'"

This reverts commit b3889294b720d6e9b3027442ac9756ca3ef07b28, reversing
changes made to f4e4d80e37743d3061ab2962c7ee89b932c18ab2.