Revert "Merge branch 'Gui'"

This reverts commit 9afecd79edcc2b1ba188bcd04d54ce664dec918d, reversing
changes made to 1207eaac5b029efe34e360ced07e2eadc548f90c.