diff --git a/library/Icingadb/Data/PivotTable.php b/library/Icingadb/Data/PivotTable.php
index 31ccd4e7..c19d50af 100644
--- a/library/Icingadb/Data/PivotTable.php
+++ b/library/Icingadb/Data/PivotTable.php
@@ -104,8 +104,7 @@ class PivotTable
             $this->order[$sort[0]] = $sort[1];
         }
 
-        // ipl/sql branch put-reset-methods-into-the trait is required for resetOrderBy().
-        $this->baseQuery = $query->setColumns($gridcols)->resetOrderBy();
+        $this->baseQuery = $query->resetColumns()->setColumns($gridcols)->resetOrderBy();
         $this->xAxisColumn = $xAxisColumn;
         $this->yAxisColumn = $yAxisColumn;
         $this->gridcols = $gridcols;