Revert 6 compserification toolbarfixes