Ubuntu

Comment 22 for bug 93077

> Feel free to close this bug; I'll revert the workaround in Ubuntu's
> xkeyboard-config packages too. Thanks!

You're mostly welcome. Thanks for your help!