Revert "Merge branch 'winh-discussion-header-commented' into 'master'"
Winnie Hellmann authored
This reverts merge request !23622
0817c210