Toolbar: Revert previous commit (9037908) because it didn't make sense.