Revert "Simplify menu_common_type_is"

This reverts commit 395dc79f6c3ebbe7a316664db35d4013daea85b4.