revert one of the whiskermenu changes, will make xflock4 work with lightdm instead and submit to upstream