I don't know what happened to ToolBarStyle in this commit :p