Merge "Restore old HTML structure for history section links"