Issue #404 by cableman: Removed last part of update in 323afb4 to get sub-menu working