A fix of the merge with PostgreSQL 9.3.2.

Fix the performance drop in DBT-1.