Revert "Modifier key sends Esc" related commits