Another Un-Revert for Postgres, while also fixing a typo I left behind from previous edit.