Revert "Merge pull request #13115 from RudyLu/keyboard/Bug928281-keyboard_OOP"

This reverts commit 9e4c9a71c93620c6529a904ee16b745d570e4a9e.