This reverts commit 28c48518c064b6c0769b43d7ddcdbbe89a169926.

Reverted until @csillag shows me why this is a significant win because
otherwise it is code here that has nothing to do with the toolbar.