Revert "Add ability to skip display of submenus"
This reverts commit 13264a7c8bb820a2080d34ece56c31bcdf42a678.