Revert portions related to hardware key rebinding for now