Revert "Merge remote-tracking branch 'origin/new_menu-system'"

This reverts commit 78893027cc7aef16824df55b35566d4b05952e0a, reversing
changes made to 1451f59fa2a432f9bd073d73f0c6c45e5c275508.

Reverting