Removed changes to brand panel.
Make no html option be dependent of bare option.
Merge branch 'fs/no-html-panel' into taller