Upstream: Apply Armin's patch to update to postgresql-0.9.33.