Revert "Merge pull request #21602 from RudyLu/keyboard/Bug1034210_commit"

This reverts commit a00bc5797ccf693a13a32572252bab410f72f30e.