This reverts commit 0379742d7e. Commit 61a385fc01 breaks the shift and caps lock key, but depends on this one.
0379742d7e
61a385fc01