WP-2298 Added patch to remove duplicate on db_select call