Revert "Merge pull request #17374 from RudyLu/keyboard/Bu983012"

This reverts commit b38047ff76a532cfd8300928b4d75e037aa03c00, reversing
changes made to 7d703cc8c5aa89f607afbca1b127b86c371ca797.