Revert "Merge pull request #13945 from timdream/keyboard-pref-off"

This reverts commit 3a0d61d3f07081db8952990aed7cee8d15dd628e, reversing
changes made to 04ae2d03ff876ffc03a2742034ab9ce89d721a14.