ENYO-589: Only reverse small header content when necessary

Cherry-picking from master to 2.5-upkeep