Merge "Revert "Make the header and file-list-header sticky.""
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.ts b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.ts
index 7ce0c65..fe2bb4d 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.ts
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.ts
@@ -876,11 +876,6 @@
       sharedStyles,
       modalStyles,
       css`
-        .header,
-        #fileListHeader {
-          position: sticky;
-          top: 0; /* Necessary to ensure it sticks to the top. */
-        }
         .container:not(.loading) {
           background-color: var(--background-color-tertiary);
         }
@@ -1242,20 +1237,14 @@
     `;
   }
 
-  private renderHeader() {
-    return html`
+  private renderChangeInfoSection() {
+    return html`<section class="changeInfoSection">
       <div class=${this.computeHeaderClass()}>
         <h1 class="assistive-tech-only">
           Change ${this.change?._number}: ${this.change?.subject}
         </h1>
         ${this.renderHeaderTitle()} ${this.renderCommitActions()}
       </div>
-    `;
-  }
-
-  private renderChangeInfoSection() {
-    return html`<section class="changeInfoSection">
-      ${this.renderHeader()}
       <h2 class="assistive-tech-only">Change metadata</h2>
       ${this.renderChangeInfo()}
     </section>`;
diff --git a/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.ts b/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.ts
index b114831..89a1ff5 100644
--- a/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.ts
+++ b/polygerrit-ui/app/elements/change/gr-file-list-header/gr-file-list-header.ts
@@ -149,9 +149,6 @@
   static override styles = [
     sharedStyles,
     css`
-      :host {
-        display: block;
-      }
       .prefsButton {
         float: right;
       }
@@ -162,9 +159,6 @@
         align-items: center;
         display: flex;
         padding: var(--spacing-s) var(--spacing-l);
-        /* Necessary to avoid that the header is transparent and shows the files */
-        background-color: var(--background-color-primary);
-        border-bottom: 1px solid var(--border-color);
       }
       .patchInfo-left {
         align-items: baseline;
diff --git a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.ts b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.ts
index 2dcfd8c..00d5a8c 100644
--- a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.ts
+++ b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.ts
@@ -337,9 +337,6 @@
           min-height: calc(var(--line-height-normal) + 2 * var(--spacing-s));
           padding: var(--spacing-xs) var(--spacing-l);
         }
-        .header-row.row {
-          border-top: none;
-        }
         /* The class defines a content visible only to screen readers */
         .noCommentsScreenReaderText {
           opacity: 0;