Just after upgrade to version 2.4, keys "insert", "home", "end", "delete", "pageup", "pagedown" switch Fish in vi mode (differs for different emulators).

Before upgrade just Escape was the switch key for the vi mode.

Is there some workaround?

OS: Debian GNU/Linux testing (stretch)
Fish version: 2.4.0
Terminal emulators: terminator 0.97-r1, sakura 3.3.4

How to reproduce:

• create new user with clean home dir;
  useradd test -d /home/test -s `which fish` && mkdir /home/test && chown test.test /home/test
• become test user;
  su test
• enable vi bindings;
  fish_vi_key_bindings
• press some of "insert", "home", "end", "delete", "pageup", "pagedown" keys

In Terminator any of "insert", "home", "end", "delete", "pageup" or "pagedown" keys will turn on vi mode, however in Sakura all except "home" and "end" keys will.

Thanks.