Revert "Not menu related, but no one bothered to do this"

This reverts commit 02247ed8dab54696b4482c41f93d1e4158a593bd.