Revert "Merge pull request #1931 from Kaik/menutree_bootstrap"

This reverts commit 40c1d4787376a4b14f04c684c84dfe7bd5ce3f6b, reversing
changes made to 6d8fb31e9b678923fd8988f4a0e7c69efe8b9a61.