Revert "GUI-957"

This reverts commit 15c83d9d18cea91b5fbaae8578d13215965b7ac7.