I think I actually already changed branding to work that way, I need to verify it still does the right thing in this rebase.