diff --git a/core/DataTable/Filter/ColumnDelete.php b/core/DataTable/Filter/ColumnDelete.php
index 37f0b1bf97fa0eb3ecc6dfec1f418899a90b0c4a..18ba41a4b24c9a800a838a95f858868c1c6d46dd 100644
--- a/core/DataTable/Filter/ColumnDelete.php
+++ b/core/DataTable/Filter/ColumnDelete.php
@@ -175,7 +175,8 @@ class ColumnDelete extends BaseFilter
                 unset($table[$index][$column]);
             }
 
-            $this->removeColumnsFromTable($row);
+            // Restore me in Piwik 4
+            //$this->removeColumnsFromTable($row);
         }
     }
 
diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions
index 79dc4a9434bc137b75319be7f6f074aa224ac14a..d74be369cc456fe9a7956dbb1e742588738d4152 160000
--- a/plugins/CustomDimensions
+++ b/plugins/CustomDimensions
@@ -1 +1 @@
-Subproject commit 79dc4a9434bc137b75319be7f6f074aa224ac14a
+Subproject commit d74be369cc456fe9a7956dbb1e742588738d4152
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/ColumnDeleteTest.php b/tests/PHPUnit/Unit/DataTable/Filter/ColumnDeleteTest.php
index 79fe1619ccab2a1ae69db9f613ddae700a933870..773482d6034022e3f2ffb9430a568fae38238995 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/ColumnDeleteTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/ColumnDeleteTest.php
@@ -35,14 +35,14 @@ class ColumnDeleteTest extends \PHPUnit_Framework_TestCase
     protected function makeDataTable_withoutVisitsColumn($appendRowWithSubtable = true)
     {
         $table = new DataTable();
-        $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row1', 'arrayColumn' => array('columnWithin' => 10))));
-        $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row2', 'arrayColumn' => array('columnWithin' => 11))));
-        $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row3', 'arrayColumn' => array('columnWithin' => 12))));
+        $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row1', 'arrayColumn' => array('visits' => 0, 'columnWithin' => 10))));
+        $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row2', 'arrayColumn' => array('visits' => 1, 'columnWithin' => 11))));
+        $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row3', 'arrayColumn' => array('visits' => 2, 'columnWithin' => 12))));
 
         if($appendRowWithSubtable) {
             $subTable = $this->makeDataTable_withoutVisitsColumn( $appendRowWithSubtable = false );
             $table->addRowFromArray(array(
-                Row::COLUMNS => array('label' => 'row4', 'arrayColumn' => array('columnWithin' => 13)),
+                Row::COLUMNS => array('label' => 'row4', 'arrayColumn' => array('visits' => 3, 'columnWithin' => 13)),
                 Row::DATATABLE_ASSOCIATED => $subTable
             ));
         }
@@ -140,9 +140,9 @@ class ColumnDeleteTest extends \PHPUnit_Framework_TestCase
     protected function makeArray_withoutVisitsColumns()
     {
         $array = array(
-            array('label' => 'row1', 'arrayColumn' => array( 'columnWithin' => 10)),
-            array('label' => 'row2', 'arrayColumn' => array( 'columnWithin' => 11)),
-            array('label' => 'row3', 'arrayColumn' => array( 'columnWithin' => 12)),
+            array('label' => 'row1', 'arrayColumn' => array('visits' => 0, 'columnWithin' => 10)),
+            array('label' => 'row2', 'arrayColumn' => array('visits' => 1, 'columnWithin' => 11)),
+            array('label' => 'row3', 'arrayColumn' => array('visits' => 2, 'columnWithin' => 12)),
         );
         return $array;
     }