Revert "Revert "KeyEvent class pimpling""