Revert keycode fixes to map instead of noremap