revert commit 0.8.10claws26