Reverting back from my last commit to make it easier to integrate with
new toolbar structure