Thread: pgsql: Revert part of recent include patch not ready for application.