This is a partial revert of f0da9ff4. The half-usable menus in gtk3 apps have been aggravating me for months.