Revert a bit of menu code for #240