This reverts commit db649c5291. I will patch the external postgresql library instead.
db649c5291
c16027de84