Revert "Integrate the normal keyboard layout switcher"
I didn't mean to land this yet
This reverts commit f2e579f9b36622b168f88f078611e418c6c9ae28.