Revert "More visibility for tool mode"

This reverts commit 372a3e4447ff77a921264639a7425eac3ab724c2.
Raised submodule pointer