* commit 'fc019bd4fa3004ec8e287fee0d277db666891ca3': Revert "Add temporary hack for keyboards not following spec."