Revert "AC-15674: Varnish 7.3 (latest version)- Sub Categories links / options of Default category are not getting displayed on Store front Home page"

This reverts commit 4ce9949.

Author: sumesh-GL

app/code/Magento/Theme/view/frontend/layout/default.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright 2013 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 -->
 <page layout="3columns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">

dev/tests/integration/testsuite/Magento/PageCache/Model/Layout/MergeTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright 2016 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 namespace Magento\PageCache\Model\Layout;
 
@@ -29,20 +29,10 @@ public function testLoadEntitySpecificHandleWithEsiBlock()
 
         /** @var EntitySpecificHandlesList $entitySpecificHandleList */
         $entitySpecificHandleList = $objectManager->get(EntitySpecificHandlesList::class);
-
-        // Register test layout file with ttl attribute
-        $testHandle = 'test_layout_with_ttl';
-
-        // Add this handle to entity-specific list to trigger validation
-        $entitySpecificHandleList->addHandle($testHandle);
-
-        // Manually add the layout XML from test fixture
-        $layoutXml = file_get_contents(__DIR__ . '/../../_files/test_layout_with_ttl.xml');
-        $layoutMerge->addUpdate($layoutXml);
-
-        // This throws exception when loading
-        // because test_layout_with_ttl is marked as entity-specific
-        // and contains a block with ttl
-        $layoutMerge->load([$testHandle]);
+        // Add 'default' handle, which has declarations of blocks with ttl, to the list of entity specific handles.
+        // This allows to simulate a situation, when block with ttl attribute
+        // is declared e.g. in 'catalog_product_view_id_1' handle
+        $entitySpecificHandleList->addHandle('default');
+        $layoutMerge->load(['default']);
     }
 }