diff --git a/src/functions/delta_scan.cpp b/src/functions/delta_scan.cpp
index 702385d..77bec7b 100644
--- a/src/functions/delta_scan.cpp
+++ b/src/functions/delta_scan.cpp
@@ -588,9 +588,9 @@ TableFunctionSet DeltaFunctions::GetDeltaScanFunction(DatabaseInstance &instance
     // The delta_scan function is constructed by grabbing the parquet scan from the Catalog, then injecting the
     // DeltaMultiFileReader into it to create a Delta-based multi file read
 
+    // FIXME revert when all required changes are applied upstream
 //    auto &parquet_scan = ExtensionUtil::GetTableFunction(instance, "parquet_scan");
 //    auto parquet_scan_copy = parquet_scan.functions;
-
     auto parquet_scan_copy = ParquetOverrideFunction::GetFunctionSet();
 
     for (auto &function : parquet_scan_copy.functions) {
diff --git a/src/include/functions/delta_scan.hpp b/src/include/functions/delta_scan.hpp
index 673a4d6..8e40019 100644
--- a/src/include/functions/delta_scan.hpp
+++ b/src/include/functions/delta_scan.hpp
@@ -91,9 +91,6 @@ struct DeltaMultiFileReaderGlobalState : public MultiFileReaderGlobalState {
     //! The idx of the file_row_number column in the result chunk
     idx_t file_row_number_idx = DConstants::INVALID_INDEX;
 
-    //! Workaround for issue with count(*) queries
-    bool mapped_row_number_to_row_idx = false;
-
     void SetColumnIdx(const string &column, idx_t idx);
 };