Revert "Merge pull request #18367 from RudyLu/keyboard/Bug993952-squash"

This reverts commit 2aa585a17b4df8ee2ae279b4ee80ff3b1ae9ab9f, reversing
changes made to fec20f4979f0dc740bf10ac5703dae70ae0e7803.