This reverts commit adfbb6c380.
adfbb6c380
fixup naming and expose disable_default_menu_bar with builder function