Revert "Merge pull request #23343 from RudyLu/keyboard/Bug1053647"

This reverts commit 39cad6c82122b964f12a66771bfbcc14fb342d9e, reversing 
changes made to bc9a482a98e16f011c82f40e3c42bababb159bf1.