Remove dependency from toolbar module

Turns out, the solution is even simpler than that: there are only 2 places where the code depends on the toolbar module, and they can be called conditionally and all should be fine. That way, it's down to the user, if they want to enable the toolbar module or not.

Got a good to go on Slack.

Automatically closed - issue fixed for 2 weeks with no activity.