Merge "Remove incorrect keymapping"