Revert "KeyEvent class pimpling"