PostgreSQL Regression from 684be04744c