Bug 23817: [Nit] Redundant TOC headers 8.1 & 9.1