upstream change to rest-postgresql-generic