upstream change to postgresql-orm