Revert "use shortened menu code for plugins"

This reverts commit 4a67e8972d713dd39bff0b5080bfa288fdd65925.