Interim commit before gui-broken rebasing.