revert GUI part of svn commit 7042