Revert some of https://github.com/Shestak/ShestakUI/commit/f25a9490027f41c907bd4e5b97926260d872caae commit.