Revert 61b471c..108b21f

This rolls back to commit 61b471c39beb88ecddb44997f76b9c66db909f68.
gui bug

gui bug