Revert "Merge branch 'gui3'"

This reverts commit 4deb4c040745f128c30a179afb2c31635254e9ac, reversing
changes made to a59c1f64dd6be8e982f5456cb691ea846f67e329.

Merged files wrong