This reverts commit c4e258bbf9d5e0d70eb9ef6800fe2491cabec8bd. Because I had committed by mistake changes to guihandler