Also restored a change that resulted in off-by-one, as well as appending the correctly indexed key_hint.
Attach a file by drag & drop or click to upload
